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
..
2011-12-29 17:19:46 +01:00
2012-09-25 15:15:16 +02:00
2012-09-30 20:43:26 +02:00
2012-08-28 15:09:49 +02:00
2011-05-11 13:43:30 +02:00
2012-02-25 04:00:43 +01:00
2012-02-09 12:26:45 +01:00
2011-12-15 18:38:04 +01:00
2012-08-08 23:43:36 +02:00
2012-08-30 17:28:21 +02:00
2012-06-13 11:33:00 +02:00
2011-12-21 19:59:45 +01:00
2012-08-22 01:03:48 +02:00
2012-09-28 16:34:18 -04:00
2012-09-29 19:27:01 +02:00
2012-09-29 19:27:01 +02:00
2012-08-31 13:01:30 +02:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-09-22 09:34:56 +02:00
2012-09-30 12:22:19 +02:00
2012-02-10 01:20:07 +01:00
2011-12-12 01:25:37 +01:00
2012-09-18 09:06:44 +02:00
2012-10-02 09:43:06 +02:00
2012-10-02 14:58:19 +02:00
2012-07-24 21:15:57 +02:00
2011-11-23 23:03:37 +01:00
2012-09-07 09:59:12 +02:00
2011-09-02 23:08:03 +02:00
2012-08-18 10:04:25 +02:00
2011-03-17 17:26:45 +01:00
2012-09-05 20:09:56 +02:00
2011-03-17 17:26:45 +01:00
2012-09-11 01:24:54 +02:00
2011-04-08 01:35:43 +02:00
2012-07-22 10:31:33 +02:00
2012-09-28 16:35:49 -04:00
2012-04-23 18:14:25 +02:00
2012-09-15 16:26:00 +02:00
2009-03-30 10:39:20 +00:00
2012-05-25 17:27:40 +02:00
2011-12-12 01:25:37 +01:00
2012-10-02 09:43:27 +02:00
2012-02-09 12:26:45 +01:00
2012-05-29 07:40:58 +02:00
2012-07-22 12:48:57 +02:00
2010-06-27 14:31:50 +00:00
2012-08-12 23:52:55 +02:00
2012-02-09 12:26:45 +01:00