Michael Niedermayer f1b5693027 Merge remote-tracking branch 'qatar/master' ... * qatar/master: Add LATM muxer v210enc: clip values according to specifications v210enc: switch to PIX_FMT_422P10 v210dec: switch to PIX_FMT_422P10 AVOptions: remove AVOption.offset <= 0 checks AVOptions: deprecate av_opt_set_defaults2 AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h libx264: fix setting some more parameters libx264: fix setting the H.264 level libx264: add 'direct-pred' private option libx264: add 'partitions' private option Conflicts: Changelog libavcodec/Makefile libavcodec/libx264.c libavcodec/v210enc.c libavfilter/src_movie.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-09-07 22:58:39 +02:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2011-09-05 22:29:16 +02:00
fate	v210dec: switch to PIX_FMT_422P10	2011-09-07 12:16:15 +02:00
lavf	Merge remote-tracking branch 'qatar/master'	2011-09-07 22:58:39 +02:00
lavfi	sws: use shift for chroma sample up convertion	2011-08-25 14:49:29 +02:00
seek	Merge remote-tracking branch 'qatar/master'	2011-09-05 22:29:16 +02:00
vsynth1	Merge remote-tracking branch 'qatar/master'	2011-08-13 22:24:47 +02:00
vsynth2	Merge remote-tracking branch 'qatar/master'	2011-08-13 22:24:47 +02:00