Merge remote-tracking branch 'mans/dnxhd'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Oct 2011 20:18:09 +0000 (22:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Oct 2011 20:18:12 +0000 (22:18 +0200)
* mans/dnxhd:
  dnxhddec: cache luma/chroma_weight*qscale tables for last qscale
  dnxhddec: merge ac_{index,run}_flags
  dnxhddec: store 2*level+1 in ac_level tables
  dnxhddec: rearrange decode_dct_block loop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dnxhddata.c
libavcodec/dnxhddata.h
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c

Simple merge
Simple merge
Simple merge
Simple merge