Michael Niedermayer
04b53746ad
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
rtpdec: Use 4 byte startcodes for H.264
matroskadec: Mark variable as av_unused.
Move some conditionally used variables into the block where they are used.
Drop some completely unnecessary av_unused attributes.
swscale: Remove unused variable alpMmxFilter.
Drop unnecessary av_uninit attributes from some variable declarations.
movenc: Support muxing wmapro in ismv/isma
mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written
swscale: move YUV2PACKED16WRAPPER() macro down to where it is used.
swscale: handle gray16 as a "planar" YUV format (Y-only, of course).
swscale: use yuv2packed1() functions for unscaled chroma also.
swscale: fix incorrect chroma bias in yuv2rgb48_1_c().
swscale: fix invalid memory accesses in yuvpacked1() functions.
Move PS2 MMI code below the mips subdirectory, where it belongs.
mips: Move MMI function declarations to a header.
build: Set correct dependencies for rtmp* protocols implemented by librtmp.
Conflicts:
libavcodec/ac3enc_template.c
libavformat/mpegtsenc.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-14 01:53:31 +01:00
2012-02-06 20:33:06 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:50:31 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-02-14 01:53:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-07 01:40:29 +01:00
2012-02-10 01:20:07 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 03:46:24 +01:00
2011-12-31 22:33:58 +01:00
2012-02-14 01:53:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-01-31 00:20:52 +01:00
2012-02-06 02:04:08 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-01-29 18:11:39 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:51:57 +01:00
2012-01-28 07:53:34 +01:00
2012-02-06 02:04:09 +01:00
2012-02-11 01:22:22 +01:00
2012-01-23 17:18:13 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 20:00:53 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-02-11 01:22:22 +01:00
2012-02-02 14:31:17 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 22:01:05 +01:00
2012-02-10 15:27:49 -05:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2011-12-22 01:51:53 +01:00
2012-02-01 02:36:09 +01:00
2012-02-05 17:42:26 +01:00
2012-02-04 02:34:14 +01:00
2012-02-03 09:29:02 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-31 07:50:31 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 14:31:17 +01:00
2012-01-06 02:45:12 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2011-12-31 17:15:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-30 11:28:08 +01:00
2012-02-01 02:36:09 +01:00
2012-02-04 02:34:14 +01:00
2012-01-28 07:53:34 +01:00
2012-02-05 20:43:33 +01:00
2012-02-03 03:51:32 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-02-11 01:40:52 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-01-29 00:34:59 +01:00
2012-02-04 02:34:14 +01:00
2012-02-14 01:53:31 +01:00
2012-02-04 02:34:14 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-06 02:45:12 +01:00
2012-01-05 10:34:06 -08:00
2012-01-05 10:34:06 -08:00
2012-02-06 02:04:09 +01:00
2012-02-14 01:53:31 +01:00
2012-01-31 02:46:26 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 23:29:34 +01:00
2012-01-02 15:34:03 +01:00
2012-02-10 15:27:49 -05:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-14 01:53:31 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2011-12-21 16:28:45 +01:00
2012-02-10 01:20:07 +01:00
2012-02-02 14:31:17 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 19:51:13 +01:00
2012-02-14 01:53:31 +01:00
2012-02-09 23:25:46 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-06 22:08:45 +01:00
2012-02-12 18:56:06 +01:00
2012-02-04 20:18:31 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-02-03 19:51:13 +01:00
2012-02-01 02:36:09 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:49 -05:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-05 02:03:12 +01:00
2012-02-01 02:36:09 +01:00
2012-02-05 20:43:33 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-03 03:06:45 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-06 02:45:12 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 01:53:31 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-01-21 23:11:27 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-11 01:22:22 +01:00
2012-01-06 02:45:12 +01:00
2012-01-31 02:46:26 +01:00
2012-01-23 01:05:20 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 15:57:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-17 02:37:30 +01:00
2012-01-16 11:29:55 +01:00
2012-01-27 10:51:57 +01:00
2012-01-16 11:29:55 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-05 16:27:07 -08:00
2012-01-28 07:53:34 +01:00
2012-02-02 02:24:09 +01:00
2012-01-06 02:45:12 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-05 23:56:52 +02:00
2012-02-10 15:27:49 -05:00
2012-02-10 15:27:49 -05:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-14 17:14:18 +01:00
2012-01-28 07:53:34 +01:00
2012-02-12 20:24:29 +01:00
2012-01-28 07:53:34 +01:00
2011-12-30 20:00:53 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-01-28 07:53:34 +01:00
2012-01-27 10:51:57 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 01:20:07 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-02-10 15:27:50 -05:00
2012-01-31 02:46:26 +01:00
04b53746ad