[FFmpeg-cvslog] Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 15:38:52 2016 +0200| [3801060cd028cc11cd4000eae8e578a715051310] | committer: Clément Bœsch

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 at stupeflix.com>

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