Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:32:15 +0000 (12:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 10:32:33 +0000 (12:32 +0200)
* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b':
  h264_ps: Drop commented-out cruft

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

Simple merge