ffmpeg/libavformat
Michael Niedermayer b25a265a5c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  pcm-mpeg: convert to bytestream2 API
  Revert "h264: clear trailing bits in partially parsed NAL units"
  remove iwmmxt optimizations
  mimic: do not continue if swap_buf_size is 0
  mimic: convert to bytestream2 API
  frwu: use MKTAG to check marker instead of AV_RL32
  txd: port to bytestream2 API
  c93: convert to bytestream2 API
  iff: make .long_name more descriptive
  FATE: add test for cdxl demuxer
  rtsp: Fix a typo

Conflicts:
	libavcodec/arm/dsputil_iwmmxt.c
	libavcodec/arm/dsputil_iwmmxt_rnd_template.c
	libavcodec/arm/mpegvideo_iwmmxt.c
	libavcodec/c93.c
	libavcodec/txd.c
	libavutil/arm/cpu.c
	tests/fate/demux.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-13 01:56:33 +01:00
..
2012-02-06 20:33:06 +01:00
2012-03-03 04:30:49 +01:00
2011-11-05 16:51:25 +01:00
2012-03-13 01:14:04 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2012-03-13 01:14:04 +01:00
2012-03-03 04:30:49 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2012-02-02 14:31:17 +01:00
2012-03-03 04:30:49 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-03-08 21:31:45 +01:00
2012-03-10 18:01:03 +01:00
2012-02-02 14:31:17 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 11:11:38 +01:00
2011-12-20 22:38:53 +01:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-26 07:30:21 +01:00
2012-02-23 16:00:22 +01:00
2012-02-28 15:01:20 +01:00
2012-02-14 10:12:44 +01:00
2012-01-16 11:29:55 +01:00
2012-03-12 21:50:46 +01:00
2011-12-30 20:00:53 +01:00