• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 79d30321
    Michael Niedermayer authored
    * qatar/master:
      wmaenc: use float planar sample format
      (e)ac3enc: use planar sample format
      aacenc: use planar sample format
      adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt
      adpcmenc: move 'ch' variable to higher scope
      adpcmenc: fix 3 instances of variable shadowing
      adpcm_ima_wav: simplify encoding
      libvorbis: use planar sample format
      libmp3lame: use planar sample formats
      vorbisenc: use float planar sample format
      ffm: do not write or read the audio sample format
      parseutils: fix parsing of invalid alpha values
      doc/RELEASE_NOTES: update for the 9 release.
      smoothstreamingenc: Add a more verbose error message
      smoothstreamingenc: Ignore the return value from mkdir
      smoothstreamingenc: Try writing a manifest when opening the muxer
      smoothstreamingenc: Move the output_chunk_list and write_manifest functions up
      smoothstreamingenc: Properly return errors from ism_flush to the caller
      smoothstreamingenc: Check the output UrlContext before accessing it
    
    Conflicts:
    	doc/RELEASE_NOTES
    	libavcodec/aacenc.c
    	libavcodec/ac3enc_template.c
    	libavcodec/wmaenc.c
    	tests/ref/lavf/ffm
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    79d30321
Name
Last commit
Last update
compat Loading commit data...
doc Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffmpeg.h Loading commit data...
ffmpeg_filter.c Loading commit data...
ffmpeg_opt.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...