Merge commit 'f7edcac040f73635fc1127489c9bb29ca8b43532'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 09:03:08 +0000 (10:03 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Dec 2015 09:03:08 +0000 (10:03 +0100)
commit68cb0dc8a3e8acec047ed078cd2c021d4dd94024
treef08a26751ef3f6670a1f18cf05a74c51dbc33436
parent92186f2d1006c1a2cfcac79a656477f1ddeb34d9
parentf7edcac040f73635fc1127489c9bb29ca8b43532
Merge commit 'f7edcac040f73635fc1127489c9bb29ca8b43532'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/avpicture.c
libavcodec/imgconvert.c