1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavdevice
Michael Niedermayer eae3cf06a5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  flvdec: Fix invalid pointer deferences when parsing index
  configure: disable hardware capabilities ELF section with suncc on Solaris x86
  Use explicit struct initializers for AVCodec declarations.
  Use explicit struct initializers for AVOutputFormat/AVInputFormat declarations.
  adpcmenc: Set bits_per_coded_sample
  adpcmenc: fix QT IMA ADPCM encoder
  adpcmdec: Fix QT IMA ADPCM decoder
  permit decoding of multichannel ADPCM_EA_XAS
  Fix input buffer size check in adpcm_ea decoder.
  fft: avoid a signed overflow
  mpegps: Handle buffer exhaustion when reading packets.

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavdevice/alsa-audio-enc.c
	libavformat/flvdec.c
	libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 22:39:52 +02:00
..
alldevices.c Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
alsa-audio-enc.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
alsa-audio.h alsa: increase max buffer size 2011-09-12 06:16:40 +02:00
avdevice.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avdevice.h Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
dshow_common.c dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dshow_enummediatypes.c DirectShow capture support 2011-05-21 17:23:14 +02:00
dshow_enumpins.c dshow: cleanup internal references on capture interface 2011-09-16 11:16:05 +02:00
dshow_filter.c dshow: cleanup internal references on capture interface 2011-09-16 11:16:05 +02:00
dshow_pin.c dshow: release pin on disconnect 2011-09-16 11:16:05 +02:00
dshow.c dshow: remove filters from graph before releasing them 2011-09-16 11:16:05 +02:00
dshow.h dshow: add audio/video options 2011-09-16 11:06:56 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +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-08-15 23:35:53 +02:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
lavfi.c lavdev/lavfi: reindent after the last commit 2011-09-16 21:22:11 +02:00
libavdevice.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libcdio.c lavd: add libcdio-paranoia input device for audio CD grabbing 2011-09-17 06:45:26 +02:00
libdc1394.c lavf,lavd: remove all usage of AVFormatParameters from demuxers. 2011-08-15 19:59:48 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
openal-dec.c openal-dec: fix missing list_devices unit for list_devices AVOption 2011-09-02 05:28:31 +02:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +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-08-15 23:35:53 +02:00
sndio_enc.c oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
v4l2.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
v4l.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00