• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d1dad7c8
    Michael Niedermayer authored
    * qatar/master:
      mpc8: return more meaningful error codes.
      mpc: return more meaningful error codes.
      wv,mpc8: don't return apetag data in packets.
      rtmp: do not warn about receiving metadata packets
      x86: h264dsp: Adjust YASM #ifdefs
      x86: yadif: Mark mmxext optimizations as such
      h264: convert loop filter strength dsp function to yasm.
      Improve descriptiveness of a number of codec and container long names
    
    Conflicts:
    	libavcodec/flvdec.c
    	libavcodec/libopenjpegdec.c
    	libavformat/apetag.c
    	libavformat/mp3dec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d1dad7c8
bmpenc.c 6.86 KB