diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 02:21:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 02:21:38 +0200 |
| commit | f08b0ff051c3bfa0027b435e6e9862d18da310d5 (patch) | |
| tree | 3f3a96160654804b42dd7f0b5d258e064525bdfa /libavcodec/dcadec.c | |
| parent | f86b2e4f499a36fd8bb084d7bbd8384ed26ba1cd (diff) | |
| parent | 5fed47b94f889b724b3214a0898aa6eac00ac575 (diff) | |
| download | ffmpeg-f08b0ff051c3bfa0027b435e6e9862d18da310d5.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
vmd: refactor the inner decode loop
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcadec.c')
0 files changed, 0 insertions, 0 deletions