Merge commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 11:50:09 +0000 (13:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 11:50:31 +0000 (13:50 +0200)
commitb884599f6a1c05ed8a0cbab72ac898d21456a58b
tree741bc18460fd29b235d1797b6edf9ad87aebdc68
parent3babbf3bf4c672624d992622cb94856c2ed95bfb
parenta11ef610eec5241e226efbd1c5bb5eb45c88d2c2
Merge commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2'

* commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2':
  h264: Remove some commented-out, broken cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_direct.c