diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-09 16:32:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-09 16:32:39 +0200 |
| commit | 3a1df52e3ce70f41c4f8b9900be2c2907b7e21ef (patch) | |
| tree | fd33523cf6ed3e5fd50a2a328c588a9a3e722fdd /mt-work/test.sh | |
| parent | aae1c247b1cd5f17c137f5c7f357c519200b1017 (diff) | |
| parent | 7351eb14151602fa924ab3d5e374b7d60f32aff9 (diff) | |
| download | ffmpeg-3a1df52e3ce70f41c4f8b9900be2c2907b7e21ef.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Pretty-print RV3/4 decoder source
Saner RV1/2 initialisation and RV2 header parsing.
Conflicts:
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'mt-work/test.sh')
0 files changed, 0 insertions, 0 deletions