[FFmpeg-cvslog] Merge commit '22c879057ead189c0f59241cb9eeb926381e3299'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 10:48:36 2013 +0200| [1b2a5817fcd6bef184d6a32ddb62a9df1dd4fd0e] | committer: Michael Niedermayer

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 at gmx.at>

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