Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Mar 2012 00:56:33 +0000 (01:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Mar 2012 00:56:33 +0000 (01:56 +0100)
commitb25a265a5c921d2d223a8aeff2f918894d515934
tree480f9648f685220520a344ac293f66e307abfc5c
parent2d38081b4f65f23077cb1b27f2d08c82c45afa05
parentbd3e07c82ae558c2cc3616115161827630826ec1
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>
18 files changed:
configure
libavcodec/arm/Makefile
libavcodec/arm/dsputil_arm.h
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/mpegvideo_arm.c
libavcodec/arm/mpegvideo_arm.h
libavcodec/c93.c
libavcodec/frwu.c
libavcodec/mimic.c
libavcodec/pcm-mpeg.c
libavcodec/s3tc.c
libavcodec/s3tc.h
libavcodec/txd.c
libavformat/iff.c
libavformat/rtsp.c
libavutil/Makefile
libavutil/cpu.c
libavutil/cpu.h