Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 01:54:45 +0000 (02:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 01:54:45 +0000 (02:54 +0100)
commite3b7f0e184a0f21ef7e5c78e180fef258f9c73aa
tree61dd6d35f1900c1e59a5bf31680132df1271dd6a
parentb6e7834ac607f51c06feaa41614661bbde3d2d8b
parentd0d111d0592bfd6b2b8bcd2321986c0fc493455d
Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'

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

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c