• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 5a35cef4
    Michael Niedermayer authored
    * qatar/master:
      ARM: enable UAL syntax in asm.S
      v4l2: don't leak video standard string on error.
      swscale: Remove disabled code.
      avfilter: Surround function only used in debug mode by appropriate #ifdef.
      vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
      build: remove BUILD_ROOT variable
      vp8: use av_clip_uintp2() where possible
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5a35cef4
mpegvideo_armv5te_s.S 3.96 KB