Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:38:13 +0000 (00:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:38:13 +0000 (00:38 +0200)
commit37ce3188decae50a14c1d430c49ecc369d5876a6
treea5b4eed88d1b50260a36e417e94c991184a8bfc6
parentb3d48c315dece7bc599012075cc92e9a80cdd6ec
parent9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521
Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'

* commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521':
  h264: drop commented out cruft

Conflicts:
libavcodec/h264_slice.c

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