Merge commit '22c879057ead189c0f59241cb9eeb926381e3299'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 08:48:36 +0000 (10:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 08:49:23 +0000 (10:49 +0200)
* commit '22c879057ead189c0f59241cb9eeb926381e3299':
  mpegvideo_enc: drop outdated copy_picture_attributes() in favour of a modern av_frame_copy_props()

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

Simple merge