Merge commit 'b19eafa2b930ee40abfde6d1f026b7fa5591c4dc' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 20:53:50 +0000 (21:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 20:53:50 +0000 (21:53 +0100)
commit5339a9f000519851d111d747a9c582981be7ee82
tree263715bdda7df2c5cad55d74d98a4d80b6779773
parentbd953f94044eec49142d3d61993682f8b2186613
parentb19eafa2b930ee40abfde6d1f026b7fa5591c4dc
Merge commit 'b19eafa2b930ee40abfde6d1f026b7fa5591c4dc' into release/0.10

* commit 'b19eafa2b930ee40abfde6d1f026b7fa5591c4dc':
  eacmv: Make sure a reference frame exists before referencing it
  mpeg4videodec: Check the width/height in mpeg4_decode_sprite_trajectory
  ivi_common: Make sure color planes have been initialized
  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
  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/eacmv.c
libavcodec/mpeg4videodec.c
libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
libavcodec/cavsdec.c
libavcodec/eacmv.c
libavcodec/ivi_common.c
libavcodec/mace.c
libavcodec/mpeg4videodec.c
libavcodec/rv30.c
libavcodec/rv40.c
libavcodec/svq3.c
libavcodec/vp3.c
libavformat/matroskadec.c
libavformat/mpc8.c
libavformat/omadec.c
libavformat/sierravmd.c