Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 May 2011 23:23:11 +0000 (01:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 May 2011 23:29:11 +0000 (01:29 +0200)
* 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: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
1  2 
Makefile
common.mak
configure
libavcodec/arm/asm.S
libavcodec/arm/dsputil_vfp.S
libavcodec/arm/fmtconvert_vfp.S
libavcodec/arm/mpegvideo_armv5te_s.S
libavcodec/arm/vp8_armv6.S
libavcodec/vp8.c
libavdevice/v4l2.c
libavfilter/vf_crop.c
libswscale/ppc/yuv2rgb_altivec.c
libswscale/rgb2rgb_template.c
libswscale/yuv2rgb.c

diff --cc Makefile
Simple merge
diff --cc common.mak
Simple merge
diff --cc configure
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge