[FFmpeg-cvslog] Merge commit 'f7edcac040f73635fc1127489c9bb29ca8b43532'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Dec  8 10:03:08 2015 +0100| [68cb0dc8a3e8acec047ed078cd2c021d4dd94024] | committer: Hendrik Leppkes

Merge commit 'f7edcac040f73635fc1127489c9bb29ca8b43532'

* commit 'f7edcac040f73635fc1127489c9bb29ca8b43532':
  avpicture: Suppress warning from deprecated code

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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