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)
commite9cb43c6f67c8882dc3f303082e9398a0cff06e1
tree9723e443af33e545f16d6a41dcbae879bb5d4e57
parent614cf1a6133a143961798c5d87c9bffc2ca0da9e
parentf34de1486aa0eb147d46ba5d2cb86a17407bb7ce
Merge commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce'

* commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce':
  h264data: Remove unused luma_dc_field_scan table

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