Merge commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 13:01:54 +0000 (15:01 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 14 Oct 2015 13:01:54 +0000 (15:01 +0200)
commit8ededd583622359062622cf008144a1511d50bbd
tree2d41ac6c1caa0153f9fe65fc1ae11f274ca81f02
parent3d93ff289e0421d71cd63e246727d8ace256f27d
parent6a23a34274b747280c1e4a00ad22f97f99bbb48a
Merge commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a'

* commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a':
  mimic: drop AVPicture usage

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