diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 00:49:18 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-08 00:49:18 +0200 |
commit | af26185bdc35bab5183e5016becd048eb50c29a1 (patch) | |
tree | de4768c6c28481d9d8e99e83b635157e6979b9b9 /libavformat/avidec.c | |
parent | af1fb1d4670fb34ea49a5742421dc3c665a86bfa (diff) | |
parent | 163196562fe744149ef599d754c30c08a9898381 (diff) | |
download | ffmpeg-af26185bdc35bab5183e5016becd048eb50c29a1.tar.gz |
Merge commit '163196562fe744149ef599d754c30c08a9898381' into release/1.1
* commit '163196562fe744149ef599d754c30c08a9898381':
oggparseogm: Convert to use bytestream2
rv34: Check the return value from ff_rv34_decode_init
matroskadec: Verify realaudio codec parameters
mace: Make sure that the channel count is set to a valid value
svq3: Check for any negative return value from ff_h264_check_intra_pred_mode
vp3: Check the framerate for validity
cavsdec: Make sure a sequence header has been decoded before decoding pictures
vocdec: Don't update codec parameters mid-stream
sierravmd: Do sanity checking of frame sizes
omadec: Properly check lengths before incrementing the position
mpc8: Make sure the first stream exists before parsing the seek table
Conflicts:
libavcodec/mace.c
libavformat/oggparseogm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
0 files changed, 0 insertions, 0 deletions