aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-21 12:32:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-21 12:32:33 +0200
commit8299ed261a950a7b114f07b37ba45bf0b539345b (patch)
treeb7b45414b7f9adc128bc6669f071e802f1930a9d /CREDITS
parent16466d92b9f795579d4020b1c7cb3ad7750cc182 (diff)
parent8fed466b0a7d636ae5035f9c6074fba9a621539b (diff)
downloadffmpeg-8299ed261a950a7b114f07b37ba45bf0b539345b.tar.gz
Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'
* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b': h264_ps: Drop commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions