diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 13:00:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 13:03:38 +0100 |
| commit | 0789374ed39a73587cd0cd781554ef058bfd8542 (patch) | |
| tree | 2e953ae803f7b2c98c1f1e560a0b5dae6447c3c2 /ffplay.c | |
| parent | 82e82fa2e5bb262b3447ee53705f378917e4f6f1 (diff) | |
| parent | 7f3624dc81a196e6d35f9b1dee81c8e863426145 (diff) | |
| download | ffmpeg-0789374ed39a73587cd0cd781554ef058bfd8542.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
svq3: unbreak decoding
No change to the code as this fix was already part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions