ffmpeg/libavformat
Michael Niedermayer 15285d8fc5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
  Remove commented-out call to non-existing function print_pow1().
  Do not decode RV30 files if the extradata is too small
  flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
  ppc: remove disabled code
  libspeexdec: Drop const qualifier to silence compiler warning.
  libopenjpeg: Drop const qualifier to silence compiler warning.
  alac: Remove unused dummy code.
  Remove unused structs and tables.
  vaapi: do not assert on value read from input bitstream
  flashsvenc: replace bitstream description by a link to the specification
  flashsvenc: drop unnecessary cast
  flashsvenc: improve some variable names and fix corresponding comments
  flashsvenc: merge two consecutive if-conditions
  flashsvenc: merge variable declarations and initializations
  flashsvenc: convert some debug av_log() to av_dlog()
  flashsvenc: whitespace cosmetics
  flashsvenc: drop some unnecessary parentheses
  flashsvenc: fix some comment typos
  aacps: skip some memcpy() if src and dst would be equal
  ...

Conflicts:
	libavcodec/vaapi_mpeg2.c
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-16 19:43:35 +02:00
..
2011-05-15 03:25:57 +02:00
2011-04-17 23:43:54 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-05-05 03:30:24 +02:00
2011-04-18 18:23:16 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-04-17 23:43:54 +02:00
2011-04-07 03:32:26 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-06-02 20:06:00 +01:00
2011-07-06 10:05:08 +02:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-04-20 04:48:23 +02:00
2011-04-02 01:54:27 +02:00
2011-06-02 20:06:00 +01:00
2011-05-30 02:39:26 +02:00
2011-04-04 02:15:12 +02:00
2011-05-01 21:13:18 +02:00
2011-06-02 20:06:00 +01:00