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)
commit8299ed261a950a7b114f07b37ba45bf0b539345b
treeb7b45414b7f9adc128bc6669f071e802f1930a9d
parent16466d92b9f795579d4020b1c7cb3ad7750cc182
parent8fed466b0a7d636ae5035f9c6074fba9a621539b
Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'

* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b':
  h264_ps: Drop commented-out cruft

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