ffmpeg/libavformat
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
2011-11-05 16:51:25 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2012-02-02 14:31:17 +01:00
2011-08-09 19:56:25 +02:00
2012-02-05 17:42:26 +01:00
2012-02-02 14:31:17 +01:00
2011-11-03 20:21:01 +01:00
2012-02-05 20:43:33 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-09 19:56:25 +02:00
2012-02-02 14:31:17 +01:00
2012-02-12 18:56:06 +01:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2012-02-05 20:43:33 +01:00
2012-01-16 11:29:55 +01:00
2012-01-14 17:14:18 +01:00
2012-02-12 20:24:29 +01:00
2011-12-30 20:00:53 +01:00