1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
FFmpeg/libavformat
Michael Niedermayer 9a9ceb8776 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavfi: add select filter
  oggdec: fix out of bound write in the ogg demuxer
  movenc: create an alternate group for each media type
  lavd: add libcdio-paranoia input device for audio CD grabbing
  rawdec: refactor private option for raw video demuxers
  pcmdec: use unique classes for all pcm demuxers.
  rawdec: g722 is always 1 channel/16kHz

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavdevice/avdevice.h
	libavfilter/avfilter.h
	libavfilter/vf_select.c
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-17 22:36:43 +02:00
..
2011-07-31 19:40:08 +02:00
2011-09-16 05:53:14 +02:00
2011-09-12 22:12:14 +02:00
2011-08-14 00:05:36 +02:00
2011-09-10 05:24:39 +02:00
2011-09-16 05:53:14 +02:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-08-09 19:56:25 +02:00
2011-05-05 03:30:24 +02:00
2011-09-07 01:10:14 +02:00
2011-08-20 00:27:38 +02:00
2011-09-16 05:53:14 +02:00
2011-08-09 19:56:25 +02:00
2011-06-02 20:06:00 +01:00
2011-08-30 23:45:39 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-08-01 00:58:49 +02:00
2011-05-30 02:39:26 +02:00
2011-08-25 21:43:30 +02:00