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>

diff --cc Changelog
index e9f594d,8e9ed38..9dab857
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -43,16 -41,36 +43,17 @@@ easier to use. The changes are
        '-preset <presetname>'.
      * -intra option was removed, it's equivalent to -g 0.
  - XMV demuxer
 +- LOAS demuxer
 +- ashowinfo filter added
  - Windows Media Image decoder
 +- amovie source added
+ - LATM muxer
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 +version 0.8:
  
  
 -version 0.7_beta2:
 -
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
 -
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support

diff --cc doc/general.texi
index 51af16d,50278e1..d071ecd
--- 1/doc/general.texi
--- 2/doc/general.texi
+++ b/doc/general.texi
@@@ -118,10 -118,9 +118,11 @@@ library
      @tab A format generated by IndigoVision 8000 video server.
  @item IVF (On2)                 @tab X @tab X
      @tab A format used by libvpx
+ @item LATM                      @tab X @tab X
  @item LMLM4                     @tab   @tab X
      @tab Used by Linux Media Labs MPEG-4 PCI boards
 +@item LOAS                      @tab   @tab X
 +    @tab contains LATM multiplexed AAC audio
  @item LXF                       @tab   @tab X
      @tab VR native stream format, used by Leitch/Harris' video servers.
  @item Matroska                  @tab X @tab X

diff --cc libavcodec/Makefile
index ac47c99,1bb6b09..c9d5781
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -547,7 -531,8 +547,8 @@@ OBJS-$(CONFIG_FLAC_MUXER)              
  OBJS-$(CONFIG_FLV_DEMUXER)             += mpeg4audio.o
  OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o
 -OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o \
+ OBJS-$(CONFIG_LATM_MUXER)              += mpeg4audio.o
 +OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)    += xiph.o mpeg4audio.o vorbis_data.o \
                                            flacdec.o flacdata.o flac.o
  OBJS-$(CONFIG_MATROSKA_DEMUXER)        += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_MATROSKA_MUXER)          += xiph.o mpeg4audio.o \

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/libx264.c
index b6d2da8,fc0ba15..4fd117f
--- 1/libavcodec/libx264.c
--- 2/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@@ -247,59 -200,9 +249,12 @@@ static av_cold int X264_init(AVCodecCon
  
      x264_param_default(&x4->params);
  
-     x4->params.b_cabac           = avctx->coder_type == FF_CODER_TYPE_AC;
-     x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
- 
-     x4->params.i_keyint_min = avctx->keyint_min;
-     if (x4->params.i_keyint_min > x4->params.i_keyint_max)
-         x4->params.i_keyint_min = x4->params.i_keyint_max;
- 
      x4->params.b_deblocking_filter         = avctx->flags & CODEC_FLAG_LOOP_FILTER;
  
-     x4->params.analyse.inter    = 0;
-     if (avctx->partitions) {
-         if (avctx->partitions & X264_PART_I4X4)
-             x4->params.analyse.inter |= X264_ANALYSE_I4x4;
-         if (avctx->partitions & X264_PART_I8X8)
-             x4->params.analyse.inter |= X264_ANALYSE_I8x8;
-         if (avctx->partitions & X264_PART_P8X8)
-             x4->params.analyse.inter |= X264_ANALYSE_PSUB16x16;
-         if (avctx->partitions & X264_PART_P4X4)
-             x4->params.analyse.inter |= X264_ANALYSE_PSUB8x8;
-         if (avctx->partitions & X264_PART_B8X8)
-             x4->params.analyse.inter |= X264_ANALYSE_BSUB16x16;
-     }
- 
-     x4->params.analyse.i_direct_mv_pred  = avctx->directpred;
- 
-     if (avctx->me_method == ME_EPZS)
-         x4->params.analyse.i_me_method = X264_ME_DIA;
-     else if (avctx->me_method == ME_HEX)
-         x4->params.analyse.i_me_method = X264_ME_HEX;
-     else if (avctx->me_method == ME_UMH)
-         x4->params.analyse.i_me_method = X264_ME_UMH;
-     else if (avctx->me_method == ME_FULL)
-         x4->params.analyse.i_me_method = X264_ME_ESA;
-     else if (avctx->me_method == ME_TESA)
-         x4->params.analyse.i_me_method = X264_ME_TESA;
-     else x4->params.analyse.i_me_method = X264_ME_HEX;
- 
-     x4->params.analyse.i_me_range         = avctx->me_range;
-     x4->params.analyse.i_subpel_refine    = avctx->me_subpel_quality;
- 
-     x4->params.analyse.b_chroma_me        = avctx->me_cmp & FF_CMP_CHROMA;
- 
-     x4->params.analyse.i_trellis          = avctx->trellis;
-     x4->params.analyse.i_noise_reduction  = avctx->noise_reduction;
- 
 +    x4->params.rc.f_ip_factor             = 1 / fabs(avctx->i_quant_factor);
 +    x4->params.rc.f_pb_factor             = avctx->b_quant_factor;
 +    x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
- 
-     if (!x4->preset)
-         check_default_settings(avctx);
- 
-     if (x4->preset || x4->tune) {
+     if (x4->preset || x4->tune)
          if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) {
              av_log(avctx, AV_LOG_ERROR, "Error setting preset/tune %s/%s.\n", x4->preset, x4->tune);
              return AVERROR(EINVAL);

diff --cc libavcodec/options.c
Simple merge

diff --cc libavcodec/v210enc.c
Simple merge

diff --cc libavfilter/src_movie.c
index 0f683db,a5d5572..c266654
--- 1/libavfilter/src_movie.c
--- 2/libavfilter/vsrc_movie.c
+++ b/libavfilter/src_movie.c
@@@ -93,25 -82,8 +93,25 @@@ static av_cold int movie_common_init(AV
      MovieContext *movie = ctx->priv;
      AVInputFormat *iformat = NULL;
      AVCodec *codec;
 -    int ret;
      int64_t timestamp;
-     av_opt_set_defaults2(movie, 0, 0);
 +    int ret;
 +
 +    movie->class = &movie_class;
++    av_opt_set_defaults(movie);
 +
 +    if (args)
 +        movie->file_name = av_get_token(&args, ":");
 +    if (!movie->file_name || !*movie->file_name) {
 +        av_log(ctx, AV_LOG_ERROR, "No filename provided!\n");
 +        return AVERROR(EINVAL);
 +    }
 +
 +    if (*args++ == ':' && (ret = av_set_options_string(movie, args, "=", ":")) < 0) {
 +        av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
 +        return ret;
 +    }
 +
 +    movie->seek_point = movie->seek_point_d * 1000000 + 0.5;
  
      av_register_all();
  

diff --cc libavfilter/vf_drawtext.c
Simple merge

diff --cc libavformat/Makefile
index 59642d7,06c2027..8796223
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -112,8 -109,8 +112,9 @@@ OBJS-$(CONFIG_IV8_DEMUXER
  OBJS-$(CONFIG_IVF_DEMUXER)               += ivfdec.o riff.o
  OBJS-$(CONFIG_IVF_MUXER)                 += ivfenc.o
  OBJS-$(CONFIG_JV_DEMUXER)                += jvdec.o
+ OBJS-$(CONFIG_LATM_MUXER)                += latmenc.o
  OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
 +OBJS-$(CONFIG_LOAS_DEMUXER)              += loasdec.o
  OBJS-$(CONFIG_LXF_DEMUXER)               += lxfdec.o
  OBJS-$(CONFIG_M4V_DEMUXER)               += m4vdec.o rawdec.o
  OBJS-$(CONFIG_M4V_MUXER)                 += rawenc.o

diff --cc libavformat/allformats.c
index e3870a5,d640340..5d0a484
--- 1/libavformat/allformats.c
--- 2/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@@ -113,8 -113,8 +113,9 @@@ void av_register_all(void
      REGISTER_DEMUXER  (IV8, iv8);
      REGISTER_MUXDEMUX (IVF, ivf);
      REGISTER_DEMUXER  (JV, jv);
+     REGISTER_MUXER    (LATM, latm);
      REGISTER_DEMUXER  (LMLM4, lmlm4);
 +    REGISTER_DEMUXER  (LOAS, loas);
      REGISTER_DEMUXER  (LXF, lxf);
      REGISTER_MUXDEMUX (M4V, m4v);
      REGISTER_MUXER    (MD5, md5);

diff --cc libavformat/version.h
index d9e9f5c,2d64826..2e4e50a
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -24,7 -24,7 +24,7 @@@
  #include "libavutil/avutil.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 53
- #define LIBAVFORMAT_VERSION_MINOR 11
 -#define LIBAVFORMAT_VERSION_MINOR  7
++#define LIBAVFORMAT_VERSION_MINOR 12
  #define LIBAVFORMAT_VERSION_MICRO  0
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

diff --cc libavutil/avutil.h
Simple merge

diff --cc libavutil/opt.c
index 4382369,1dec9a6..2d4f873
--- 1/libavutil/opt.c
--- 2/libavutil/opt.c
+++ b/libavutil/opt.c
@@@ -123,7 -124,7 +123,7 @@@ int av_set_string3(void *obj, const cha
          *o_out = o;
      if (!o)
          return AVERROR_OPTION_NOT_FOUND;
-     if ((!val && o->type != FF_OPT_TYPE_STRING) || o->offset<=0)
 -    if (!val)
++    if (!val && o->type != FF_OPT_TYPE_STRING)
          return AVERROR(EINVAL);
  
      if (o->type == FF_OPT_TYPE_BINARY) {

diff --cc libavutil/opt.h
Simple merge

diff --cc tests/ref/lavf/ffm
index b20e132,cdfec4d..f9a8f67
--- 1/tests/ref/lavf/ffm
--- 2/tests/ref/lavf/ffm
+++ b/tests/ref/lavf/ffm
@@@ -1,3 -1,3 +1,3 @@@
- f9bee27ea1b6b83a06b5f9efb0a4ac1f *./tests/data/lavf/lavf.ffm
 -bf46c0b53fc318d0a60fa9bf446b2e4f *./tests/data/lavf/lavf.ffm
++58a0235967d10543268184eea50a3b65 *./tests/data/lavf/lavf.ffm
  376832 ./tests/data/lavf/lavf.ffm
  ./tests/data/lavf/lavf.ffm CRC=0xf361ed74