[FFmpeg-cvslog] Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 02:54:45 2013 +0100| [e3b7f0e184a0f21ef7e5c78e180fef258f9c73aa] | committer: Michael Niedermayer

Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'

* commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d':
  mpegvideo: remove commented out cruft from ff_MPV_frame_end()

Conflicts:
	libavcodec/mpegvideo.c

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

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