[FFmpeg-cvslog] Merge commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Wed Jun 29 15:00:01 2016 +0200| [7f607120d99762b07b94e97ce3e32a60b8d114a2] | committer: Clément Bœsch

Merge commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6'

* commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6':
  h264: drop an outdated comment

This commit is a noop, see 237d31e0b98b95eef687e612177ca3ea24b709fc

Merged-by: Clément Bœsch <clement at stupeflix.com>

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