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)
* commit '59dfc2b0c89f35c5805abee72c2ae4ee7af8e98d':
  h263: Drop commented-out code and a related otherwise unused function

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

Simple merge
Simple merge