• 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
..
fate Loading commit data...
lavf Loading commit data...
lavf-fate Loading commit data...
lavfi Loading commit data...
seek Loading commit data...
vsynth1 Loading commit data...
vsynth2 Loading commit data...