ffmpeg/libavdevice
Michael Niedermayer ec7f0b527c Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8
* khirnov/release/0.7: (64 commits)
  rv34: Check for invalid slice offsets
  rv34: Fix potential overreads
  rv34: Avoid NULL dereference on corrupted bitstream
  rv10: Reject slices that does not have the same type as the first one
  lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails
  oggdec: fix out of bound write in the ogg demuxer
  Fixed size given to init_get_bits().
  smacker: fix a few off by 1 errors
  Check for invalid VLC value in smacker decoder.
  Check and propagate errors when VLC trees cannot be built in smacker decoder.
  Fixed off by one packet size allocation in the smacker demuxer.
  Check for invalid packet size in the smacker demuxer.
  ape demuxer: fix segfault on memory allocation failure.
  xan: Add some buffer checks (cherry picked from commit 0872bb23b4)
  Fixed size given to init_get_bits() in xan decoder. (cherry picked from commit 393d5031c6)
  smacker demuxer: handle possible av_realloc() failure.
  Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.
  cljr: init_get_bits size in bits instead of bytes (cherry picked from commit 0c1f5b93d9)
  indeo2: fail if input buffer too small (cherry picked from commit b7ce4f1d1c)
  indeo2: init_get_bits size in bits instead of bytes (cherry picked from commit 68ca330cbd)
  ...

Conflicts:
	ffmpeg.c
	libavdevice/alsa-audio.h
	libavformat/gxf.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-22 01:10:24 +02:00
..
Makefile lavdev: add SDL output device 2011-05-28 19:17:14 +02:00
alldevices.c lavdev: add SDL output device 2011-05-28 19:17:14 +02:00
alsa-audio-common.c Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8 2011-09-22 01:10:24 +02:00
alsa-audio-dec.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
alsa-audio-enc.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
alsa-audio.h Merge remote-tracking branch 'khirnov/release/0.7' into release/0.8 2011-09-22 01:10:24 +02:00
avdevice.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avdevice.h sdl: use the filename for defining the window title, if not specified 2011-06-05 13:17:38 +02:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-06-06 03:33:58 +02:00
dshow.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
dshow.h lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
dshow_common.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_enummediatypes.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_enumpins.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_filter.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_pin.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-06-03 05:19:30 +02:00
dv1394.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2011-06-06 03:33:58 +02:00
jack_audio.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
libavdevice.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2011-06-06 03:33:58 +02:00
oss_audio.c oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
sdl.c sdl: align option fields after last commit 2011-06-05 13:55:02 +02:00
sndio_common.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
sndio_common.h lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
sndio_dec.c Merge remote-tracking branch 'qatar/master' 2011-05-26 03:28:22 +02:00
sndio_enc.c oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
v4l.c lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h 2011-05-27 12:15:09 +02:00
v4l2.c v4l2: set default standard to NULL 2011-06-07 13:37:55 +02:00
vfwcap.c Do not free BITMAPINFOHEADER before we are done using it. 2011-09-21 17:56:15 +02:00
x11grab.c x11grab: remove a memory allocation and the associated memcpy. 2011-06-12 12:18:05 +02:00