Merge commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:00:01 +0000 (15:00 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 13:00:01 +0000 (15:00 +0200)
commit7f607120d99762b07b94e97ce3e32a60b8d114a2
tree157468878c7e9dc9048d8b9694f6b2a239ca93f5
parent3c5a3882f988aba19a984e80119d72ca9d32b7d4
parentb93c0aed79f7f942e0dec26e53c147f297ce2ff6
Merge commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6'

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

This commit is a noop, see 237d31e0b98b95eef687e612177ca3ea24b709fc

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