• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 0ed7bc49
    Michael Niedermayer authored
    * qatar/master: (31 commits)
      libx264: set default thread count to 0 (auto)
      lavc: cosmetics, group deprecated codec flags
      mpeg12: add 'scan_offset' private option.
      h263/p encoder: add 'structured_slices' private option.
      h263/p encoder: add 'obmc' private option.
      h263p encoder: add 'aiv' private option.
      h263p encoder: add 'umv' private option.
      mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
      mjpegdec: add 'extern_huff' private option.
      mpeg4enc: add 'data_partitioning' private option.
      snow: add 'memc_only' private option.
      libx264: add 'mbtree' private option.
      libx264: add 'psy' private option.
      libmp3lame: add 'reservoir' private option.
      mpeg2enc: add 'non_linear_quant' private option
      mpeg12enc: add drop_frame_timecode private option.
      mpeg12enc: add intra_vlc private option.
      VC1: Support dynamic dimension changes
      mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
      lavc: deprecate CODEC_FLAG2_BRDO
      ...
    
    Conflicts:
    	avconv.c
    	libavcodec/libmp3lame.c
    	libavcodec/libx264.c
    	libavcodec/mjpegdec.c
    	libavcodec/mpeg12enc.c
    	libavcodec/mpegvideo.h
    	libavcodec/vc1.c
    	libavcodec/vc1dec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0ed7bc49
avconv.c 155 KB