Merge commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:12:04 +0000 (12:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:12:10 +0000 (12:12 +0200)
* commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce':
  h264data: Remove unused luma_dc_field_scan table

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264data.h

Simple merge