Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 13:38:52 +0000 (15:38 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 13:38:52 +0000 (15:38 +0200)
commit3801060cd028cc11cd4000eae8e578a715051310
treea14e358ba30363ae39cf96bfff7c4ee8a1bc1430
parentd12cce3fb25e6bb3b7a2b3874fd576a786ccc6b6
parentc11c693accaad65d3f4afa44c27f2338a2e3bf8f
Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'

* commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f':
  h264: Drop broken trace debug output

This commit is not merged as the debug was fixed in
94011f994ab2e531a49fabbb2c86e735f87df3ca.

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