generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1a34478b71
ffmpeg/libavdevice
History
Michael Niedermayer 1a34478b71 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix NASM include directive
  dsputil_mmx: Honor HAVE_AMD3DNOW
  lavf,lavd: remove all usage of AVFormatParameters from demuxers.
  jack: add 'channels' private option.
  VC-1: fix reading of custom PAR.
  Remove redundant and dubious video codec detection by its extradata
  mpeg12: remove repeat-field code disabled since May 2002
  patch checklist: suggest fate instead of regression tests
  Turn on resampling on sudden size change instead of bailing out during recode.
  avtools: reinitialise filter chain when input video stream changes dimensions

Conflicts:
	Makefile
	avconv.c
	doc/developer.texi
	ffplay.c
	libavcodec/x86/dsputil_mmx.c
	libavdevice/libdc1394.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-15 23:35:53 +02:00
..
alldevices.c lavdev: add libavfilter virtual input device 2011-08-11 17:20:17 +02:00
alsa-audio-common.c Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
alsa-audio-dec.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
alsa-audio-enc.c ALSA: implement get_output_timestamp. 2011-07-01 09:49:32 +02:00
alsa-audio.h Merge remote-tracking branch 'qatar/master' 2011-07-10 04:28:50 +02:00
avdevice.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avdevice.h lavdev: add libavfilter virtual input device 2011-08-11 17:20:17 +02:00
bktr.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +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
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
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-08-15 23:35:53 +02:00
lavfi.c lavdev/lavfi: correctly set the inout pad index when linking a filter to the output sink 2011-08-14 01:56:28 +02:00
libavdevice.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
libdc1394.c lavf,lavd: remove all usage of AVFormatParameters from demuxers. 2011-08-15 19:59:48 +02:00
Makefile lavdev: add libavfilter virtual input device 2011-08-11 17:20:17 +02:00
openal-dec.c openal: prefer ISC license 2011-07-01 10:51:46 +02:00
oss_audio.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +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-08-15 23:35:53 +02:00
v4l.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
vfwcap.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
x11grab.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00