OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
28c1115
)
h264: add missing brackets.
author
Ronald S. Bultje
<rsbultje@gmail.com>
Fri, 12 Aug 2011 19:32:31 +0000
(12:32 -0700)
committer
Ronald S. Bultje
<rsbultje@gmail.com>
Fri, 12 Aug 2011 19:32:31 +0000
(12:32 -0700)
This caused failure of a few fate tests.
libavcodec/h264_refs.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_refs.c
b/libavcodec/h264_refs.c
index
50925ce
..
b7e43e7
100644
(file)
--- a/
libavcodec/h264_refs.c
+++ b/
libavcodec/h264_refs.c
@@
-515,9
+515,10
@@
int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
pic = find_short(h, frame_num, &j);
if(!pic){
if(mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg]
- || h->long_ref[mmco[i].long_arg]->frame_num != frame_num)
- av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
- err = AVERROR_INVALIDDATA;
+ || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) {
+ av_log(h->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n");
+ err = AVERROR_INVALIDDATA;
+ }
continue;
}
}