diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:20:33 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:21:12 +0100 |
commit | 76367f453f6f7cb340c4798a2b059b81abc60c71 (patch) | |
tree | cabb58f365838f07074aa48a8290b706232aacc1 /libavfilter/vf_delogo.c | |
parent | d32245e5b12cd3c8aa8740585db950bfa628e69d (diff) | |
parent | 073cd30fb4dc1c2a885c62540e3cfaac1f17c21b (diff) | |
download | ffmpeg-76367f453f6f7cb340c4798a2b059b81abc60c71.tar.gz |
Merge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b'
* commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b':
isom: Support MPEG-2 video mov files from FPC5
See: 0aded6bf028ff188e3bbd7eb023bd854b474b794
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_delogo.c')
0 files changed, 0 insertions, 0 deletions