[FFmpeg-cvslog] Merge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  5 22:18:32 2015 +0200| [097efa475056e38dba8a194ff841a6ab4f1f847b] | committer: Michael Niedermayer

Merge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'

* commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8':
  h264: remove a commented out nonsense line

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

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