5 Commits

Author	SHA1	Message	Date
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
Nathan Caldwell	6cb8c85409	Opus encoder using libopus ... Signed-off-by: Diego Biurrun <diego@biurrun.de>	2012-10-01 14:42:40 +02:00
Michael Niedermayer	2acb5cd907	Merge remote-tracking branch 'qatar/master' ... * qatar/master: libopus: Remap channels using libopus' internal remapping. Opus decoder using libopus avcodec: document the use of AVCodecContext.delay for audio decoding vc1dec: add flush function for WMV9 and VC-1 decoders http: Increase buffer sizes to cope with longer URIs nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments h264_refs: Fix debug tprintf argument types golomb: const correctness for get_ue()/get_se() function arguments get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments Conflicts: Changelog libavcodec/Makefile libavcodec/version.h libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2012-09-28 13:54:40 +02:00
Nathan Caldwell	d16860a237	libopus: Remap channels using libopus' internal remapping. ... This way we can directly remap channels from Opus' channel order to libav's internal channel order, instead of mapping channels from Opus' order to Vorbis' order then to libav's order. Signed-off-by: Diego Biurrun <diego@biurrun.de>	2012-09-28 11:03:32 +02:00
Nicolas George	44617d6ec9	Opus decoder using libopus ... Signed-off-by: Diego Biurrun <diego@biurrun.de>	2012-09-28 11:03:20 +02:00