Merge commit '9925f7df0a50387ade8d83cb85b40c53e41e7041' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 21:41:41 +0000 (22:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 21:44:32 +0000 (22:44 +0100)
commit93e3ec451caf12ebb22fbf3ecdb7bba41f7835c6
tree59f9dbe216cc6860b8556a3a6b615a131d1e44e7
parent76c48a78d1c0842d26b8ae926af3610935b0f280
parent9925f7df0a50387ade8d83cb85b40c53e41e7041
Merge commit '9925f7df0a50387ade8d83cb85b40c53e41e7041' into release/0.10

* commit '9925f7df0a50387ade8d83cb85b40c53e41e7041':
  vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
  r3d: Add more input value validation
  fraps: Make the input buffer size checks more strict
  svq3: Avoid a division by zero
  rmdec: Validate the fps value
  twinvqdec: Check the ibps parameter separately
  asfdec: Check the return value of asf_read_stream_properties
  mxfdec: set audio timebase to 1/samplerate
  pcx: Check the packet size before assuming it fits a palette
  rpza: Fix a buffer size check
  xxan: Disallow odd width
  xan: Only read within the data that actually was initialized

Conflicts:
libavcodec/fraps.c
libavformat/mxfdec.c
tests/ref/seek/lavf_mxf
tests/ref/seek/lavf_mxf_d10

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
libavcodec/fraps.c
libavcodec/pcx.c
libavcodec/rpza.c
libavcodec/svq3.c
libavcodec/twinvq.c
libavcodec/vc1dec.c
libavcodec/xan.c
libavcodec/xxan.c
libavformat/asfdec.c
libavformat/mxfdec.c
libavformat/r3d.c
libavformat/rmdec.c
tests/ref/seek/lavf_mxf
tests/ref/seek/lavf_mxf_d10