[FFmpeg-cvslog] Merge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 12 00:07:50 2013 +0100| [3b2b07397c41dce79d0bb0ecad6321e7349c00b7] | committer: Michael Niedermayer

Merge commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69'

* commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69':
  mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b2b07397c41dce79d0bb0ecad6321e7349c00b7
---