Michael Niedermayer f97faf6751 Merge remote-tracking branch 'qatar/master' ... * qatar/master: id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays VC1: restore mistakenly removed code twinvq: check output buffer size before decoding twinvq: return an error when the packet size is too small lavf: export some forgotten symbols with non-av prefixes. swscale: update altivec yuv2planeX asm to new per-plane API. swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware. yuv2planeX10 SIMD swscale: decide whether to use yuv2plane1/X on a per-plane basis. swscale: reintroduce full precision in 16-bit output. Split up yuv2yuvX functions Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition lavc: translate non-flag-based er options into flag-based ef options at codec open add -err_filter AVOptions to access flag-based error recognition h264_weight: initialize "height" function argument properly. presets: spelling error in libvpx 1080p50_60 avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X Conflicts: ffplay.c libavformat/libavformat.v libswscale/swscale.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-23 05:13:56 +02:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
fate	Merge remote-tracking branch 'qatar/master'	2011-10-21 02:01:26 +02:00
lavf	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
lavfi	Merge remote-tracking branch 'qatar/master'	2011-10-23 05:13:56 +02:00
seek	utils: flush on successfull av_seek_frame_binary()	2011-10-21 22:26:13 +02:00
vsynth1	regression tests: add jpeg2000	2011-09-27 21:32:39 +02:00
vsynth2	regression tests: add jpeg2000	2011-09-27 21:32:39 +02:00