[FFmpeg-cvslog] Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  2 14:38:01 2012 +0200| [82db8ee3211014a38db6b8cae03f1c3246938eee] | committer: Michael Niedermayer

Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
  avconv: improve sample format negotiation for decoder request
  Opus encoder using libopus
  mpegts: Drop pointless casting of hex_dump_debug arguments
  avformat: const correctness for av_hex_dump / av_hex_dump_log
  wmadec: Adjust debug printf argument length modifier

Conflicts:
	Changelog
	ffmpeg.c
	libavcodec/libopusdec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82db8ee3211014a38db6b8cae03f1c3246938eee
---