[FFmpeg-cvslog] Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 30 00:38:13 2014 +0200| [37ce3188decae50a14c1d430c49ecc369d5876a6] | committer: Michael Niedermayer

Merge commit '9d76dd952ffd9fffc7f9fb5cc5af6d093ba54521'

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

Conflicts:
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37ce3188decae50a14c1d430c49ecc369d5876a6
---