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)
commit1b2a5817fcd6bef184d6a32ddb62a9df1dd4fd0e
tree49add4f0735a5aed2e13f12ae8c4650e8c7f4de1
parenteb02f0c6e83386bf8a13ab8113e5d8cff9fa72d3
parent22c879057ead189c0f59241cb9eeb926381e3299
Merge commit '22c879057ead189c0f59241cb9eeb926381e3299'

* 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>
libavcodec/mpegvideo_enc.c