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
..
bswap.h	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
intmath.h	arm: fix av_clipl_int32() asm	2011-10-11 20:25:55 +02:00
intreadwrite.h	Merge remote-tracking branch 'qatar/master'	2011-05-31 02:08:20 +02:00
timer.h