git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6423557
)
lavf/mkv: Only skip prores header if the packet is large enough.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Wed, 20 May 2015 22:43:38 +0000
(
00:43
+0200)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Wed, 20 May 2015 22:43:38 +0000
(
00:43
+0200)
Fixes a possible endless loop.
libavformat/matroskaenc.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskaenc.c
b/libavformat/matroskaenc.c
index
7cbba0b
..
c4c58f4
100644
(file)
--- a/
libavformat/matroskaenc.c
+++ b/
libavformat/matroskaenc.c
@@
-1575,7
+1575,7
@@
static void mkv_write_block(AVFormatContext *s, AVIOContext *pb,
} else
data = pkt->data;
- if (codec->codec_id == AV_CODEC_ID_PRORES) {
+ if (codec->codec_id == AV_CODEC_ID_PRORES
&& size >= 8
) {
/* Matroska specification requires to remove the first QuickTime atom
*/
size -= 8;