1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/libavdevice
Michael Niedermayer a78f6b8cb9 Merge remote-tracking branch 'qatar/master'
* qatar/master: (38 commits)
  v210enc: remove redundant check for pix_fmt
  wavpack: allow user to disable CRC checking
  v210enc: Use Bytestream2 functions
  cafdec: Check return value of avio_seek and avoid modifying state if it fails
  yop: Check return value of avio_seek and avoid modifying state if it fails
  tta: Check return value of avio_seek and avoid modifying state if it fails
  tmv: Check return value of avio_seek and avoid modifying state if it fails
  r3d: Check return value of avio_seek and avoid modifying state if it fails
  nsvdec: Check return value of avio_seek and avoid modifying state if it fails
  mpc8: Check return value of avio_seek and avoid modifying state if it fails
  jvdec: Check return value of avio_seek and avoid modifying state if it fails
  filmstripdec: Check return value of avio_seek and avoid modifying state if it fails
  ffmdec: Check return value of avio_seek and avoid modifying state if it fails
  dv: Check return value of avio_seek and avoid modifying state if it fails
  bink: Check return value of avio_seek and avoid modifying state if it fails
  Check AVCodec.pix_fmts in avcodec_open2()
  svq3: Prevent illegal reads while parsing extradata.
  remove ParseContext1
  vc1: use ff_parse_close
  mpegvideo parser: move specific fields into private context
  ...

Conflicts:
	libavcodec/4xm.c
	libavcodec/aacdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/mpeg4video_parser.c
	libavcodec/svq3.c
	libavcodec/v210enc.c
	libavformat/cafdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-11 01:22:22 +01:00
..
alldevices.c devices: Disable v4l to fix compilation until someone 2012-01-28 08:44:33 +01:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
alsa-audio-enc.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
alsa-audio.h Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
avdevice.c libavdevice: increase LIBAVDEVICE_VERSION_MICRO to 100 2011-12-22 03:06:33 +01:00
avdevice.h Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
bktr.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c dshow: use DirectShow information to set time_base 2012-02-03 18:12:29 +01:00
dshow.h
dv1394.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dv1394.h cleanup: for(int 2011-12-13 21:08:43 +01:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
lavfi.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
libavdevice.v
libcdio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
libdc1394.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
Makefile buildsystem: 10l add v4l entry back 2012-01-25 00:46:41 +01:00
openal-dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
pulse.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sdl.c Make sdl_overlay_pix_fmt_map static const. 2011-11-05 15:37:02 +01:00
sndio_common.c
sndio_common.h
sndio_dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sndio_enc.c
timefilter.c Merge remote-tracking branch 'qatar/master' 2012-02-11 01:22:22 +01:00
timefilter.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
v4l2.c Support YV12 from video4linux2 devices. 2012-02-05 20:06:12 +01:00
v4l.c v4l: fix compilation 2012-01-25 00:13:35 +01:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
x11grab.c Use the correct pix_fmt for 32bit x11grab. 2012-02-02 13:29:14 +01:00