Michael Niedermayer 7f83db3124 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (46 commits) mtv: Make sure audio_subsegments is not 0 v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined avconv: add symbolic names for -vsync parameters flvdec: Fix compiler warning for uninitialized variables rtsp: Fix compiler warning for uninitialized variable ulti: convert to new bytestream API. swscale: Use standard multiple inclusion guards in ppc/ header files. Place some START_TIMER invocations in separate blocks. v4l2: list available formats v4l2: set the proper codec_tag v4l2: refactor device_open v4l2: simplify away io_method v4l2: cosmetics v4l2: uniform and format options v4l2: do not force interlaced mode avio: exit early in fill_buffer without read_packet vc1dec: fix invalid memory access for small video dimensions rv34: fix invalid memory access for small video dimensions rv34: joint coefficient decoding and dequantization avplay: Don't call avio_set_interrupt_cb(NULL) ... Conflicts: Changelog avconv.c doc/APIchanges doc/indevs.texi libavcodec/adxenc.c libavcodec/dnxhdenc.c libavcodec/h264.c libavdevice/v4l2.c libavformat/flvdec.c libavformat/mtv.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-05 02:03:12 +01:00
..
output.asm	swscale: split scale.asm.	2012-01-03 20:02:07 -08:00
rgb2rgb_template.c
rgb2rgb.c
scale.asm	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
swscale_mmx.c	Merge remote-tracking branch 'qatar/master'	2011-12-14 23:58:10 +01:00
swscale_template.c	sws: remove unused variable	2011-12-03 00:04:42 +01:00
yuv2rgb_mmx.c
yuv2rgb_template.c