diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 21:57:24 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 21:57:47 +0200 |
commit | 3ee83f46058449913abeca7ba82e8e2909828209 (patch) | |
tree | 20d83fc9cb70dfc35d7574e2cd59e62806fe6e07 /libavformat/internal.h | |
parent | 205c13685f36a17f406b7cd07e14b6d2a61f396a (diff) | |
parent | 940173d4d1e40b025f0ac15f2572eef537fb1186 (diff) | |
download | ffmpeg-3ee83f46058449913abeca7ba82e8e2909828209.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf utils: Remove write-only variable
lavf utils: Rename shadowing variable
smacker: fix a few off by 1 errors
Check for invalid VLC value in smacker decoder.
Check and propagate errors when VLC trees cannot be built in smacker decoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/internal.h')
0 files changed, 0 insertions, 0 deletions