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)
commit8c6370afe3437e7f3e6398faa721f8f3e0a1e034
treecc2225b991dad6c027683233baf772163d4ec20d
parent0f8bb0efc3cf9e2b86c7e518f24133ea358566d5
parent2b4c38d3c647f409080606ef02b3363ada00be2c
Merge commit '2b4c38d3c647f409080606ef02b3363ada00be2c'

* commit '2b4c38d3c647f409080606ef02b3363ada00be2c':
  h264: drop some mpegvideo remnants from draw_horiz_band()

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