diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-17 13:06:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-17 13:06:12 +0100 |
| commit | 130dc9518779eb1b389d0cdf7348802e2b25f201 (patch) | |
| tree | 32686c5b876b16dab4125d6667bb0d80096d70b9 /ffmpeg.h | |
| parent | abf91f7fee326fae0d70ca1a481c51e8eab1dd5e (diff) | |
| parent | da5408ede972ab474f7df9023471a7bcd7092abb (diff) | |
| download | ffmpeg-130dc9518779eb1b389d0cdf7348802e2b25f201.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a bink version 'b' test
FATE: add a bink version 'i' test
libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions