diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 10:27:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-01 10:27:47 +0200 |
| commit | 0c2f673ed28ab6d187b4ce41396623f9e9378785 (patch) | |
| tree | f86207e19c7fec004e7f229b9ffc037682fff6da /libavformat/img2dec.c | |
| parent | b919a8d3a38559bb5f60a66839ca6f3358b1c908 (diff) | |
| parent | 33f64fd5d588a82b8bae1b1b5ea627c0c80b01d6 (diff) | |
| download | ffmpeg-0c2f673ed28ab6d187b4ce41396623f9e9378785.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo4: expand allowed quantiser range
configure: icl: Merge -Qdiag-error parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2dec.c')
0 files changed, 0 insertions, 0 deletions