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