Merge commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Jan 2013 12:57:10 +0000 (13:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Jan 2013 12:57:10 +0000 (13:57 +0100)
* commit 'aeaf268e52fc11c1f64914a319e0edddf1346d6a':
  vp3: integrate clear_blocks with idct of previous block.
  mpegvideo: fix loop condition in draw_line()
  dvdsubdec: parse the size from the extradata

Conflicts:
libavcodec/dvdsubdec.c
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/vp3dsp_neon.S
libavcodec/mpegvideo.c
libavcodec/ppc/vp3dsp_altivec.c
libavcodec/vp3.c
libavcodec/vp3dsp.c
libavcodec/vp3dsp.h
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp3dsp_init.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge