diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:44:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 13:44:08 +0200 |
| commit | 395538e0735e81a2efc14573e83e323c779f4b66 (patch) | |
| tree | fac09aeb9abce64be10fe616f1f896d5f14cbf10 /libavresample/utils.c | |
| parent | a367ab657f29869d46ca57ce58251b02343a2b53 (diff) | |
| parent | 95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54 (diff) | |
| download | ffmpeg-395538e0735e81a2efc14573e83e323c779f4b66.tar.gz | |
Merge commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54' into release/1.1
* commit '95db1624ef98ccc4ba7ff70d50c4b4d0f8ffed54':
indeo3: switch parsing the header to bytestream2
indeo3: check motion vectors.
rv10: check that extradata is large enough
indeo3: fix data size check
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions