Merge commit '9cbae3a7d57bd2b862c37fd8123bd1fba680e801'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:07:36 +0000 (14:07 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:07:36 +0000 (14:07 +0100)
commit5fe1578571367314f8f67cdbc33cfd4d129c3bf7
tree28e396f48a05256392727f74218457ba28ad59ba
parentaf7c7037150d572fa791b7465cda68d2ed720e02
parent9cbae3a7d57bd2b862c37fd8123bd1fba680e801
Merge commit '9cbae3a7d57bd2b862c37fd8123bd1fba680e801'

* commit '9cbae3a7d57bd2b862c37fd8123bd1fba680e801':
  roqvideodec: use av_frame_copy

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