aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/lls.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-07 22:15:45 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-07 22:15:45 +0100
commit2a741baeff359aa7e8a5bb2c1a225d6ac9cf10ee (patch)
treeea6297f44cdb93006755af33888e70ac976f9143 /libavutil/lls.h
parent86e7d20ac2e7cfd6385f84e78117058c1ea0882f (diff)
parentb3f04657368a32a9903406395f865e230b1de348 (diff)
downloadffmpeg-2a741baeff359aa7e8a5bb2c1a225d6ac9cf10ee.tar.gz
Merge commit 'b3f04657368a32a9903406395f865e230b1de348'
* commit 'b3f04657368a32a9903406395f865e230b1de348': segment: Fix the failure paths Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lls.h')
0 files changed, 0 insertions, 0 deletions