Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Sep 2011 20:32:59 +0000 (22:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Sep 2011 20:58:39 +0000 (22:58 +0200)
commitf1b5693027d48a9e448f21595fb9247893c225cf
treed01e1b5a8a3abe464cd5be4d86122f0818b60132
parenta2b66a366d7d9d7dacc217601b5e4406624f91ea
parent0ca36b4de76e10578e23199c2932682c0f510e31
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>
16 files changed:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/options.c
libavcodec/v210enc.c
libavfilter/src_movie.c
libavfilter/vf_drawtext.c
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
libavutil/avutil.h
libavutil/opt.c
libavutil/opt.h
tests/ref/lavf/ffm