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
..
2011-07-27 02:05:49 +02:00
2011-09-06 18:51:09 +02:00
2011-09-05 22:29:16 +02:00
2011-05-11 13:43:30 +02:00
2011-03-29 02:27:13 +02:00
2011-05-20 10:14:00 +02:00
2011-08-09 19:56:21 +02:00
2011-08-23 04:34:14 +02:00
2011-06-02 14:43:29 +02:00
2011-06-07 00:37:00 +02:00
2011-07-13 00:42:11 +02:00
2011-05-27 10:41:46 +02:00
2011-04-19 01:17:59 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:21 +02:00
2011-08-09 19:56:24 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-08-13 02:56:08 +02:00
2011-09-07 04:18:43 +02:00
2011-09-07 22:58:39 +02:00
2011-04-10 04:31:54 +02:00
2011-08-11 17:32:54 +02:00
2011-09-02 23:08:03 +02:00
2011-08-09 19:56:21 +02:00
2011-06-29 09:14:56 +01:00
2011-07-10 04:28:50 +02:00
2011-04-08 01:35:43 +02:00
2011-06-05 13:17:38 +02:00
2011-08-09 19:56:21 +02:00
2011-06-21 20:58:39 +02:00
2011-07-09 21:53:59 +02:00