diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 15:09:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 15:14:13 +0100 |
| commit | 9f47f95e7087fc03605cbc1f9738fc1201fdb43f (patch) | |
| tree | cfe386fd380a134412bafa02a43846b6d3790575 /libavformat/seek.c | |
| parent | 9b89824f20223c6e84c897540456642211d54e7e (diff) | |
| parent | 9aa22918c258bfe8ee0769fe158d41a344e3178a (diff) | |
| download | ffmpeg-9f47f95e7087fc03605cbc1f9738fc1201fdb43f.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
prores: Error out only on surely incomplete ac_coeffs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/seek.c')
0 files changed, 0 insertions, 0 deletions