diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 12:54:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-13 12:56:32 +0100 |
| commit | 7f8ef7876efe99e7e9d0e41b0a56530877536496 (patch) | |
| tree | 89216011c97d22065a9a30f8429b295f9aff9644 /libavcodec/vc1data.h | |
| parent | 76fa78911f58c9707226559e0f57be8d47fb2fca (diff) | |
| parent | e3f50f247155216229e34f165bae8c329d5a001e (diff) | |
| download | ffmpeg-7f8ef7876efe99e7e9d0e41b0a56530877536496.tar.gz | |
Merge commit 'e3f50f247155216229e34f165bae8c329d5a001e'
* commit 'e3f50f247155216229e34f165bae8c329d5a001e':
dnxhdenc: check negative index
Conflicts:
libavcodec/dnxhdenc.c
Not merged, the cid index thats taken out of our table will be found again in
said table.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1data.h')
0 files changed, 0 insertions, 0 deletions