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
..
fate	Merge remote-tracking branch 'qatar/master'	2012-01-04 01:12:34 +01:00
ref	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
audiogen.c	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
base64.c
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
copycooker.sh
fate_config.sh.template	tests: add a FATE configuration template	2011-11-24 00:33:20 +01:00
fate-run.sh	fate: give stderr hint when a test fails.	2011-12-26 22:27:01 +01:00
fate-update.sh
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
lavfi-regression.sh
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2012-01-01 00:07:31 +01:00
md5.sh
regression-funcs.sh	Run zmbv regression without md5sum.	2011-12-10 19:34:28 +01:00
rotozoom.c	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
tiny_psnr.c
videogen.c	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00