• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f1b56930
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f1b56930
Makefile 42.2 KB