diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 09:44:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 09:44:57 +0200 |
| commit | ab78e21ea285309b3d0a997a06cf993ff45b9fdc (patch) | |
| tree | e96f9364808ac38d559263ec50259420c245fc80 /libavcodec/assenc.c | |
| parent | 8ef89833d0a4829cbf471511d191a987f6933bba (diff) | |
| parent | 676da248cad49debc40720baa13214f0b94dcc71 (diff) | |
| download | ffmpeg-ab78e21ea285309b3d0a997a06cf993ff45b9fdc.tar.gz | |
Merge commit '676da248cad49debc40720baa13214f0b94dcc71'
* commit '676da248cad49debc40720baa13214f0b94dcc71':
vmd: refactor the inner decode loop
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assenc.c')
0 files changed, 0 insertions, 0 deletions