Merge commit '2b4c38d3c647f409080606ef02b3363ada00be2c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:42:10 +0000 (21:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:42:14 +0000 (21:42 +0100)
* commit '2b4c38d3c647f409080606ef02b3363ada00be2c':
  h264: drop some mpegvideo remnants from draw_horiz_band()

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

Simple merge