aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/rc4.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-25 04:37:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-25 04:37:27 +0200
commit3ae818f6ab04f14838ee073e685d73519725f6d1 (patch)
treef316d7abcb908b1ae92759b860bacf4b51100683 /libavutil/rc4.h
parent45fd5935313bf29f5e09bab7ec49a98d73d9b9af (diff)
parente0caa1eb4e518111a81801db0d2ccdd2733ba94b (diff)
downloadffmpeg-3ae818f6ab04f14838ee073e685d73519725f6d1.tar.gz
Merge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b'
* commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b': matroskadec: check return values Conflicts: libavformat/matroskadec.c See: 1116491c53156dd1972eca3e65d5a3b8529c4658 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/rc4.h')
0 files changed, 0 insertions, 0 deletions