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)
* commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d':
  mpegvideo: remove commented out cruft from ff_MPV_frame_end()

Conflicts:
libavcodec/mpegvideo.c

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

Simple merge