• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · b25a265a
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b25a265a
Makefile 4.67 KB