diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 20:28:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 20:28:37 +0200 |
| commit | 497d66126242a94c32c146434e543ee2833e6349 (patch) | |
| tree | af57a50fe5a4cb179cf491833407cfd3bd4cef0f /libavcodec/aacpsdata.c | |
| parent | 8044ab94e485d2c40ff8d87a7907f31ed2ebc997 (diff) | |
| parent | b5d7b80a7e43779ca2962ba56442579c2a7e927d (diff) | |
| download | ffmpeg-497d66126242a94c32c146434e543ee2833e6349.tar.gz | |
Merge commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d' into release/0.10
* commit 'b5d7b80a7e43779ca2962ba56442579c2a7e927d':
ffv1dec: check that global parameters do not change in version 0/1
Conflicts:
libavcodec/ffv1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsdata.c')
0 files changed, 0 insertions, 0 deletions