Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 13:54:06 +0000 (14:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jan 2013 14:33:23 +0000 (15:33 +0100)
commit26345acb0e723d28aa28e09126ea383b2f679f5b
treef8d7a9f62d7557aca5ad56dd244fa415fdab56f2
parent9774251c45eadfe0ba7b0381344451fa8840cc0d
parent0881cbf314982cce8448bd12644ce2a6e0b8c576
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdec: support mixed interlaced/non-interlaced content
  vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/proresdec_lgpl.c
libavcodec/vp3.c
libavcodec/vp3dsp.c
libavcodec/vp3dsp.h
libavcodec/vp56.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/vp3dsp_init.c