diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:47:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:47:54 +0200 |
| commit | 081f4f5f56e0f6220039e39b9be2c2a2021dd40c (patch) | |
| tree | aeb240725399c0183fdad326aa245697422e9162 /libavcodec/atrac.c | |
| parent | f953c3c2343dc78c45a001aa38ecb20cee447df7 (diff) | |
| parent | e4fb53c73abece15a7c5df0019df9a0371db2297 (diff) | |
| download | ffmpeg-081f4f5f56e0f6220039e39b9be2c2a2021dd40c.tar.gz | |
Merge commit 'e4fb53c73abece15a7c5df0019df9a0371db2297' into release/1.1
* commit 'e4fb53c73abece15a7c5df0019df9a0371db2297':
ffv1dec: check that global parameters do not change in version 0/1
Conflicts:
libavcodec/ffv1dec.c
See: f78a3868fd3d8f66da68338c0783aa15f98833bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac.c')
0 files changed, 0 insertions, 0 deletions