diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 17:08:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 17:09:39 +0200 |
| commit | 113229922ae2faa065e5758534b83e73bda65978 (patch) | |
| tree | c2eed2249bd00f8f24375a5d8ba5b597630a4de5 /libswscale/Makefile | |
| parent | b097d1765b38b39312935d01045b65bd79960317 (diff) | |
| parent | da7d839a0d3ec40423a665dc85e0cfaed3f92eb8 (diff) | |
Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8'
* commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8':
ffv1dec: check that global parameters do not change in version 0/1
Conflicts:
libavcodec/ffv1dec.c
See: b05cd1ea7e45a836f7f6071a716c38bb30326e0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
0 files changed, 0 insertions, 0 deletions