diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-09 13:04:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-09 13:04:51 +0200 |
commit | 694550f18e026c1d7736a40961d080ec32a4c31b (patch) | |
tree | bc105a1dbd305b42346fdb5b25e1aacd08f6db75 /libavcodec/libcelt_dec.c | |
parent | 0dd99628ea15f1fe7121b8a983c0b1fe57660027 (diff) | |
parent | 9a1ec1f2f223b19f5ce574c3683ac6827fe93633 (diff) | |
download | ffmpeg-694550f18e026c1d7736a40961d080ec32a4c31b.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Force correct extradata for AVID AVCI50 in mov.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libcelt_dec.c')
0 files changed, 0 insertions, 0 deletions