• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 12327237
    Michael Niedermayer authored
    * qatar/master:
      aacenc: Fix issues with huge values of bit_rate.
      dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
      proresenc: multithreaded quantiser search
      riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
      avconv: only set the "channels" option when it exists for the specified input format
      avplay: update get_buffer to be inline with avconv
      aacdec: More robust output configuration.
      faac: Fix multi-channel ordering
      faac: Add .channel_layouts
      rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
      rtmp: Support 'rtmp_app', an option which overrides the name of application
      avutil: add better documentation for AVSampleFormat
    
    Conflicts:
    	libavcodec/aac.h
    	libavcodec/aacdec.c
    	libavcodec/aacenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    12327237
ffmpeg.c 216 KB