Merge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:42:30 +0000 (14:42 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 11 Apr 2016 13:42:30 +0000 (14:42 +0100)
commit8cae006c5646a08fd73cf62c46bb16598be6c7b4
tree1de1ff8a96137e1e70004ad2ddc47540e5c44e6c
parent6bc5ef37cbf6628dd4f4c9dae9d8b3009fc81408
parent1138eb5509d3db7f6d565cb45f137a786d22beb9
Merge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9'

* commit '1138eb5509d3db7f6d565cb45f137a786d22beb9':
  vsrc_movie: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavfilter/src_movie.c