aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-12 13:05:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-12 13:09:24 +0200
commit5353bd0285277df9d81d143c262c4698fba4dc6a (patch)
tree388eb494233d00b1085f7d4b3910cd496c383fa6 /libavresample/utils.c
parent065996b9843b6366bab23d0c6adc61c05c0f9f75 (diff)
parentb90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1 (diff)
downloadffmpeg-5353bd0285277df9d81d143c262c4698fba4dc6a.tar.gz
Merge commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1' into release/1.1
* commit 'b90816d94b0b5c01f451ff98cfbf1d5ddec9c3c1': matroska: Update the available size after lace parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions