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
..
2010-03-02 21:41:52 +00:00
2010-03-02 21:41:52 +00:00
2010-03-02 21:41:52 +00:00
2010-03-02 21:41:52 +00:00
2011-05-10 07:53:19 -04:00
2010-03-07 19:25:58 +00:00
2011-08-13 19:13:03 +02:00
2011-09-07 22:58:39 +02:00
2010-03-02 21:41:52 +00:00
2011-07-08 19:58:19 +02:00
2011-04-12 19:06:26 -04:00
2010-03-15 16:37:02 +00:00
2010-06-04 22:41:11 +00:00
2010-03-02 21:41:52 +00:00
2011-05-13 07:38:54 +02:00
2011-04-12 19:06:26 -04:00
2010-03-02 21:41:52 +00:00
2011-07-17 20:12:02 +02:00
2011-07-17 20:12:02 +02:00
2011-05-10 07:53:19 -04:00
2010-05-21 21:38:54 +00:00
2010-03-02 21:41:52 +00:00
2010-03-07 19:25:58 +00:00
2010-03-07 19:25:58 +00:00
2010-03-02 21:41:52 +00:00
2011-07-11 03:54:30 +02:00
2010-08-31 17:53:48 +00:00
2010-03-07 19:25:58 +00:00
2010-03-02 21:41:52 +00:00
2011-04-26 17:19:37 -04:00
2010-03-07 19:25:58 +00:00
2010-03-02 21:41:52 +00:00
2010-03-07 19:25:58 +00:00
2010-03-07 19:25:58 +00:00
2011-07-14 02:24:10 +02:00
2010-03-02 21:41:52 +00:00
2011-01-19 12:51:42 +00:00
2010-03-02 21:41:52 +00:00
2010-03-02 21:41:52 +00:00