• 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
..
aiff Loading commit data...
alaw Loading commit data...
asf Loading commit data...
au Loading commit data...
avi Loading commit data...
bmp Loading commit data...
caf Loading commit data...
dpx Loading commit data...
dv_fmt Loading commit data...
ffm Loading commit data...
flv_fmt Loading commit data...
gif Loading commit data...
gxf Loading commit data...
ismv Loading commit data...
jpg Loading commit data...
mkv Loading commit data...
mmf Loading commit data...
mov Loading commit data...
mpg Loading commit data...
mulaw Loading commit data...
mxf Loading commit data...
mxf_d10 Loading commit data...
nut Loading commit data...
ogg Loading commit data...
pam Loading commit data...
pbmpipe Loading commit data...
pcx Loading commit data...
pgm Loading commit data...
pgmpipe Loading commit data...
pixfmt Loading commit data...
png Loading commit data...
ppm Loading commit data...
ppmpipe Loading commit data...
rm Loading commit data...
rso Loading commit data...
sgi Loading commit data...
sox Loading commit data...
sunrast Loading commit data...
swf Loading commit data...
tga Loading commit data...
tiff Loading commit data...
ts Loading commit data...
voc Loading commit data...
voc_s16 Loading commit data...
wav Loading commit data...
wtv Loading commit data...
xbm Loading commit data...
xwd Loading commit data...
yuv4mpeg Loading commit data...