diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 13:37:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 13:37:40 +0200 |
| commit | a8e5fac1fb3fddeea829648139aa345af9cdc16c (patch) | |
| tree | 46a212be2aa790088f37b483ebe5096e8f729b2d /libavformat/jacosubenc.c | |
| parent | ccb422a69728ac739b20ba2c67d49d265fd20fdb (diff) | |
| parent | dc79685195a45c9b8b17d7b93d118e0aefa45462 (diff) | |
| download | ffmpeg-a8e5fac1fb3fddeea829648139aa345af9cdc16c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: Bound-check before applying transform
Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
See: af388237093ed6df6f5118b34ef938a2ca2ffbda, 0846719dd11ab3f7a7caee13e7af71f71d913389
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jacosubenc.c')
0 files changed, 0 insertions, 0 deletions