• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · c55780dc
    Michael Niedermayer authored
    * qatar/master: (32 commits)
      libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
      libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
      libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
      libvo-*: Fix up the long codec names
      libavcodec: Mark AVCodec->priv_class const
      swscale: Factorize FAST_BGR2YV12 definition.
      libvo-aacenc: Only produce extradata if the global header flag is set
      lavf: postpone removal of public metadata conversion API
      lavc: postpone removal of request_channels
      lavc: postpone removal of audioconvert and sample_fmt wrappers
      lavf: postpone removal of deprecated avio functions
      libopencore-amr: Cosmetics: Rewrap and align
      libopencore-amr, libvo-amrbwenc: Rename variables and functions
      libopencore-amr: Convert commented out debug logging into av_dlog
      libopencore-amr: Remove an unused state variable
      libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
      libopencore-amr: Remove a useless local variable
      libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
      libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
      libopencore-amr: Don't print carriage returns in log messages
      ...
    
    Conflicts:
    	doc/developer.texi
    	libavcodec/avcodec.h
    	libavcodec/libvo-aacenc.c
    	libavcodec/libvo-amrwbenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c55780dc
rgb2rgb.c 15.9 KB