Michael Niedermayer
b008ac18bb
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
docs: use -bsf:[vas] instead of -[vas]bsf.
mpegaudiodec: Prevent premature clipping of mp3 input buffer.
lavf: move the packet keyframe setting code.
oggenc: free comment header for all codecs
lcl: error out if uncompressed input buffer is smaller than framesize.
mjpeg: abort decoding if packet is too large.
golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.
get_bits: add HAVE_BITS_REMAINING macro.
lavf/output-example: use new audio encoding API correctly.
lavf/output-example: more proper usage of the new API.
tiff: Prevent overreads in the type_sizes array.
tiff: Make the TIFF_LONG and TIFF_SHORT types unsigned.
apetag: do not leak memory if avio_read() fails
apetag: propagate errors.
SBR DSP x86: implement SSE sbr_hf_g_filt
SBR DSP x86: implement SSE sbr_sum_square_sse
SBR DSP: use intptr_t for the ixh parameter.
Conflicts:
doc/bitstream_filters.texi
doc/examples/muxing.c
doc/ffmpeg.texi
libavcodec/golomb.h
libavcodec/x86/Makefile
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-25 04:00:43 +01:00
2012-02-16 01:34:37 +01:00
2012-02-25 04:00:43 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-25 04:00:43 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-25 02:41:42 +01:00
2012-02-21 05:10:12 +01:00
2012-02-11 01:22:22 +01:00
2012-02-23 04:31:55 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-02 02:24:09 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-25 02:50:58 +01:00
2012-02-01 02:36:09 +01:00
2012-02-21 05:10:12 +01:00
2012-02-20 15:08:41 -05:00
2012-02-12 01:06:13 +01:00
2012-02-24 02:57:18 +01:00
2012-02-17 12:35:08 -08:00
2012-02-11 08:23:42 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-22 11:37:32 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-13 02:06:44 +01:00
2012-02-10 01:20:07 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-13 02:06:44 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 23:01:47 +01:00
2012-02-16 03:05:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-22 02:24:18 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-09 19:16:15 -08:00
2012-02-05 02:08:03 +01:00
2012-02-10 01:20:07 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-21 05:10:12 +01:00
2012-02-24 04:22:20 +01:00
2012-02-24 02:57:18 +01:00
2012-02-07 01:40:29 +01:00
2012-02-24 03:30:42 +01:00
2012-02-24 02:57:18 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-02 18:44:52 +01:00
2012-02-16 23:25:51 +01:00
2012-02-25 04:00:43 +01:00
2012-02-24 02:57:18 +01:00
2012-02-02 02:24:09 +01:00
2012-02-25 04:00:43 +01:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-19 15:29:10 +01:00
2012-02-19 03:57:54 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-14 01:22:38 +01:00
2012-02-16 01:34:37 +01:00
2012-02-09 01:27:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 04:12:40 +01:00
2012-02-15 22:06:38 +02:00
2012-02-06 19:39:24 +01:00
2012-02-14 01:22:38 +01:00
2012-02-14 01:22:38 +01:00
2012-02-24 02:57:18 +01:00
2012-02-15 22:06:46 +02:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-25 04:00:43 +01:00
2012-02-24 02:57:18 +01:00
2012-02-21 05:10:12 +01:00
2012-02-01 15:51:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-21 05:10:12 +01:00
2012-02-09 23:55:33 +01:00
2012-02-24 02:57:18 +01:00
2012-02-07 18:28:00 +01:00
2012-02-21 05:10:12 +01:00
2012-02-24 02:57:18 +01:00
2012-02-18 02:31:38 +01:00
2012-02-24 02:57:18 +01:00
2012-02-22 02:24:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-24 02:57:18 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-24 04:22:20 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-25 04:00:43 +01:00
2012-02-20 01:29:30 +01:00
2012-02-23 04:31:55 +01:00
2012-02-22 02:24:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-21 05:10:12 +01:00
2012-02-25 04:00:43 +01:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-24 04:13:01 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-19 04:15:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-07 15:48:33 +01:00
2012-02-21 05:10:12 +01:00
2012-02-22 03:37:18 +01:00
2012-02-10 23:18:52 +01:00
2012-02-22 02:24:18 +01:00
2012-02-19 16:26:46 +01:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2012-02-15 07:14:45 +01:00
2012-02-15 07:14:45 +01:00
2012-02-16 19:55:16 +01:00
2012-02-23 04:31:55 +01:00
2012-02-17 16:49:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 04:13:27 +01:00
2012-02-23 04:31:55 +01:00
2012-02-12 20:24:29 +01:00
2012-02-24 02:57:18 +01:00
2012-02-22 03:45:43 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-09 23:25:46 +01:00
2012-02-09 01:27:12 +01:00
2012-02-10 01:20:07 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-20 01:29:30 +01:00
2012-02-14 19:03:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-15 01:52:14 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 14:58:25 -08:00
2012-02-20 14:58:25 -08:00
2012-02-16 01:34:37 +01:00
2012-02-22 02:24:18 +01:00
2012-02-23 15:50:06 -08:00
2012-02-23 15:50:06 -08:00
2012-02-21 05:10:12 +01:00
2012-02-17 00:35:06 +01:00
2012-02-01 04:43:06 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 06:25:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-22 02:24:18 +01:00
2012-02-17 14:28:56 -05:00
2012-02-19 15:54:27 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-21 05:10:12 +01:00
2012-02-25 04:00:43 +01:00
2012-02-24 02:57:18 +01:00
2012-02-02 14:31:17 +01:00
2012-02-02 14:31:17 +01:00
2012-02-24 02:57:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-06 08:00:31 +01:00
2012-02-18 02:20:19 +01:00
2012-02-23 23:38:20 +01:00
2012-02-06 00:29:32 +01:00
2012-02-23 23:42:04 +01:00
2012-02-21 05:10:12 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-22 11:37:32 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-19 01:47:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-24 02:57:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-19 01:47:10 +01:00
2012-02-19 22:08:21 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-20 01:29:30 +01:00
2012-02-17 00:35:06 +01:00
2012-02-17 20:46:37 +01:00
2012-02-22 03:45:43 +01:00
2012-02-23 23:40:51 +01:00
2012-02-04 01:12:04 +01:00
2012-02-21 05:10:12 +01:00
b008ac18bb