• 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
Name
Last commit
Last update
..
bfin Loading commit data...
mlib Loading commit data...
ppc Loading commit data...
sparc Loading commit data...
x86 Loading commit data...
Makefile Loading commit data...
colorspace-test.c Loading commit data...
libswscale.v Loading commit data...
options.c Loading commit data...
rgb2rgb.c Loading commit data...
rgb2rgb.h Loading commit data...
rgb2rgb_template.c Loading commit data...
swscale-test.c Loading commit data...
swscale.c Loading commit data...
swscale.h Loading commit data...
swscale_internal.h Loading commit data...
swscale_template.c Loading commit data...
utils.c Loading commit data...
yuv2rgb.c Loading commit data...