diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:15:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:16:10 +0200 |
| commit | 5b1a953960ddb78995c9a784baf910ad3299ecce (patch) | |
| tree | 1be104440f774237ff879ebb862810a10ebd9b57 /tools/zmqshell.py | |
| parent | 1578986a0da41ab417ddddf5964fa192d27b759f (diff) | |
| parent | 8231764784a405f546e9c427a6de22d3f4de5c35 (diff) | |
| download | ffmpeg-5b1a953960ddb78995c9a784baf910ad3299ecce.tar.gz | |
Merge commit '8231764784a405f546e9c427a6de22d3f4de5c35' into release/2.2
* commit '8231764784a405f546e9c427a6de22d3f4de5c35':
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 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions