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
(parent:
8009a51
)
avformat/flvdec: remove duplicated line error
author
Clément Bœsch
<u@pkh.me>
Thu, 1 Jan 2015 21:09:21 +0000
(22:09 +0100)
committer
Clément Bœsch
<u@pkh.me>
Thu, 1 Jan 2015 21:09:21 +0000
(22:09 +0100)
Fix typo regression since
5c37ffca59e7eb1b8768f237deb35a9936c1a0a5
Found-By: cousin_luigi
libavformat/flvdec.c
patch
|
blob
|
history
diff --git
a/libavformat/flvdec.c
b/libavformat/flvdec.c
index
c13c0e4
..
572268f
100644
(file)
--- a/
libavformat/flvdec.c
+++ b/
libavformat/flvdec.c
@@
-441,7
+441,6
@@
static int amf_parse_object(AVFormatContext *s, AVStream *astream,
if (amf_parse_object(s, astream, vstream, str_val, max_pos,
depth + 1) < 0)
return -1;
- if (avio_r8(ioc) != AMF_END_OF_OBJECT)
if (avio_r8(ioc) != AMF_END_OF_OBJECT) {
av_log(s, AV_LOG_ERROR, "Missing AMF_END_OF_OBJECT in AMF_DATA_TYPE_MIXEDARRAY\n");
return -1;