Merge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:18:32 +0000 (22:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:18:43 +0000 (22:18 +0200)
* commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8':
  h264: remove a commented out nonsense line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c

Simple merge