aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mace.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-15 02:05:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-15 02:35:28 +0100
commit140dfd14fdab67daf9f067509b09a667cbf788d4 (patch)
tree8e173ef919b7e715e0d4e4ea5f92783d7f1de974 /libavcodec/mace.c
parent3cfd07a53fd91becb7ab07ec9f6250d3faaeb381 (diff)
parent456ffec35d55288d589aa1901919e038c3427f30 (diff)
downloadffmpeg-140dfd14fdab67daf9f067509b09a667cbf788d4.tar.gz
Merge commit '456ffec35d55288d589aa1901919e038c3427f30'
* commit '456ffec35d55288d589aa1901919e038c3427f30': img2dec: correctly use the parsed value from -start_number No change, start_number works fine without this change and does not work with it Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mace.c')
0 files changed, 0 insertions, 0 deletions