ffmpeg/libavutil
Michael Niedermayer 79d30321a2 Merge remote-tracking branch 'qatar/master'
* 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: Michael Niedermayer <michaelni@gmx.at>
2012-10-07 11:28:38 +02:00
..
2012-07-11 04:04:29 +02:00
2012-07-16 19:30:13 +00:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-09-15 19:47:10 -04:00
2012-10-01 16:41:37 +02:00
2012-08-15 22:32:06 +03:00
2012-05-15 18:08:32 +02:00
2012-08-09 01:44:15 +02:00
2012-08-22 14:29:10 +01:00
2012-06-09 02:51:02 +02:00
2012-07-07 01:41:55 +00:00
2012-10-01 22:24:17 +02:00
2012-09-10 00:07:26 +01:00
2012-10-06 14:03:15 +02:00
2012-07-06 17:08:22 +02:00