Merge commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:03:54 +0000 (04:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 02:04:06 +0000 (04:04 +0200)
commit78f50e7eb69437fd108c82f963e7add5e9faa36e
treee002d6f54bae69854cd4eb6c879317c1639a3f51
parent966a57b6e918d87e94d8457dfed457e087ceddf4
parent59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d
Merge commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d'

* commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d':
  h263: Drop commented-out code and a related otherwise unused function

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