aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-24 10:44:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-24 10:44:42 +0200
commitcaac12bd49844c776e1acda2908df198998cea63 (patch)
treea8c43b30b7ee4e8d20352ee8ac7cd0b19a242c64 /CREDITS
parent1ea28ffc4dbcdda64dc2e774c186f668ef7b030f (diff)
parentfb13fe8342faff6f7ca9c747aff5d7cf7c5202c6 (diff)
downloadffmpeg-caac12bd49844c776e1acda2908df198998cea63.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: golomb: reduce scope of a few variables Conflicts: libavcodec/golomb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions