Michael Niedermayer
0f1446a4d0
Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' ...
* commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b':
vf_overlay: get rid of pointless messing with timebase.
samplefmt: make av_samples_alloc() initialize the data to silence.
libspeexdec: handle NULL return value from speex_packet_to_header()
h264probe: Don't error out on bits that no longer are reserved
mpegvideo: set extended_data in ff_update_duplicate_context()
libspeexdec: properly handle DTX for multiple frames-per-packet
libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used
libspeexdec: simplify setting of frame_size
libspeexdec: set channel_layout
Conflicts:
libavfilter/vf_overlay.c
libavformat/h264dec.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-04 13:11:45 +02:00
2012-10-03 13:35:02 +02:00
2012-07-11 04:04:29 +02:00
2012-09-24 13:41:48 +02:00
2012-09-09 13:27:42 +02:00
2012-02-04 20:27:02 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 01:51:53 +01:00
2011-11-23 04:02:17 +01:00
2012-07-16 19:30:13 +00:00
2012-08-15 22:32:06 +03:00
2012-04-20 09:43:11 -04:00
2012-09-13 15:35:50 +02:00
2012-09-13 15:35:50 +02:00
2012-08-16 16:20:30 +02:00
2011-12-13 00:39:48 +01:00
2012-09-19 19:49:24 +02:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2012-10-04 12:30:25 +02:00
2012-07-04 23:23:17 +02:00
2012-09-15 19:47:10 -04:00
2012-07-31 13:15:43 +02:00
2011-12-13 00:39:48 +01:00
2012-08-13 14:38:43 +02:00
2012-09-05 14:09:09 +02:00
2012-10-01 16:41:37 +02:00
2011-12-05 00:11:57 +01:00
2012-01-29 00:34:59 +01:00
2012-09-19 21:57:58 +02:00
2011-09-21 21:25:43 +02:00
2012-08-16 16:20:30 +02:00
2012-08-11 15:01:45 +02:00
2012-09-16 02:53:32 +02:00
2012-08-15 22:32:06 +03:00
2012-08-16 16:20:30 +02:00
2011-12-12 01:25:37 +01:00
2012-05-15 18:08:32 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-06-19 20:53:27 +02:00
2012-06-19 20:53:27 +02:00
2012-08-16 16:20:30 +02:00
2012-06-26 13:12:12 +02:00
2012-08-09 01:44:15 +02:00
2011-06-28 13:14:46 +02:00
2012-10-04 12:30:25 +02:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2012-07-02 14:05:40 +03:00
2012-08-22 14:29:10 +01:00
2012-09-04 21:45:13 +02:00
2011-06-08 05:25:28 +02:00
2012-10-01 10:24:28 +02:00
2011-07-04 00:45:21 +02:00
2012-06-09 02:51:02 +02:00
2012-07-11 23:57:11 +02:00
2011-07-12 01:42:32 +02:00
2012-08-16 16:20:30 +02:00
2012-07-07 01:41:55 +00:00
2012-03-26 13:00:09 +02:00
2011-12-31 16:31:15 +01:00
2012-10-01 22:24:17 +02:00
2012-06-06 20:00:35 +02:00
2012-07-01 22:43:09 +02:00
2012-06-16 12:47:46 +02:00
2012-01-29 00:34:59 +01:00
2012-07-10 11:37:03 +03:00
2012-09-10 00:07:26 +01:00
2012-09-30 10:23:08 +02:00
2012-09-30 10:23:08 +02:00
2012-09-17 12:46:55 +02:00
2012-09-06 00:40:01 +02:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2012-09-04 17:04:51 +02:00
2012-06-29 11:23:56 +02:00
2012-07-06 17:08:22 +02:00
2012-06-22 22:48:00 +02:00
2012-09-08 17:30:10 +02:00
2011-11-23 04:02:17 +01:00
2012-03-26 13:00:09 +02:00
2012-08-05 22:17:02 +02:00
2011-06-24 03:07:04 +02:00
2012-10-04 13:11:45 +02:00
2012-10-04 13:11:45 +02:00
2012-02-14 01:53:31 +01:00
2011-11-23 04:02:17 +01:00
2012-06-22 22:34:02 +02:00
2012-06-22 22:34:02 +02:00
2012-08-08 09:11:26 +02:00
2012-08-08 09:11:26 +02:00
2012-08-16 16:20:30 +02:00
2012-06-10 00:37:02 +02:00
2012-08-16 16:20:30 +02:00
2012-05-20 16:19:36 +02:00
2012-08-04 23:51:43 +02:00
2012-10-04 13:11:45 +02:00
2012-09-13 19:31:02 +02:00
2012-10-01 22:24:17 +02:00
2012-10-01 22:24:17 +02:00
2012-10-04 12:30:25 +02:00
2012-08-10 16:25:23 +02:00
0f1446a4d0