Michael Niedermayer 82db8ee321 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@gmx.at>

2012-10-02 14:58:19 +02:00

1.5 KiB

Raw Blame History

View Raw