1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
FFmpeg/libavdevice
Michael Niedermayer d1dad7c824 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpc8: return more meaningful error codes.
  mpc: return more meaningful error codes.
  wv,mpc8: don't return apetag data in packets.
  rtmp: do not warn about receiving metadata packets
  x86: h264dsp: Adjust YASM #ifdefs
  x86: yadif: Mark mmxext optimizations as such
  h264: convert loop filter strength dsp function to yasm.
  Improve descriptiveness of a number of codec and container long names

Conflicts:
	libavcodec/flvdec.c
	libavcodec/libopenjpegdec.c
	libavformat/apetag.c
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-31 22:41:00 +02:00
..
alldevices.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
alsa-audio-common.c
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
bktr.c bktr: use AV_OPT_TYPE_IMAGE_SIZE. 2012-05-20 18:24:20 +02:00
caca.c lavd/caca: create display *after* checking dither options 2012-07-22 10:32:21 +02:00
dshow_capture.h dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_common.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enummediatypes.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_enumpins.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_filter.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow_pin.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dshow.c dshow: rename dshow.h to avoid conflict with system header of equal name 2012-05-24 14:15:10 +02:00
dv1394.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
dv1394.h cosmetics: various spelling fixes 2012-07-06 17:08:22 +02:00
fbdev.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
iec61883.c FireWire DV/HDV input device using libiec61883 2012-07-05 13:02:49 +02:00
jack_audio.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
lavfi.c lavfi: remove old video sink API 2012-06-26 11:40:08 +02:00
libavdevice.v
libcdio.c
libdc1394.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
openal-dec.c
oss_audio.c Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
pulse.c
sdl.c lavd/sdl: use verb in options help message 2012-07-19 23:56:59 +02:00
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c
timefilter.h
v4l2.c v4l2: remove call to v4l2_fd_open. 2012-07-20 21:12:10 +02:00
v4l.c
version.h libcaca output device 2012-07-21 03:33:02 +00:00
vfwcap.c
x11grab.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00