[SCM] libav/experimental: indent
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:26:02 UTC 2013
The following commit has been merged in the experimental branch:
commit 4f10312c19d037226e967dc2c1e3eb0a922690ef
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Fri Jul 25 12:26:24 2008 +0000
indent
Originally committed as revision 14390 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e4e1875..7de129b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3567,20 +3567,20 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
"in complementary field pair "
"(first field is long term)\n");
} else {
- pic= remove_short(h, s->current_picture_ptr->frame_num);
- if(pic){
- unreference_pic(h, pic, 0);
- av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
- }
+ pic= remove_short(h, s->current_picture_ptr->frame_num);
+ if(pic){
+ unreference_pic(h, pic, 0);
+ av_log(h->s.avctx, AV_LOG_ERROR, "illegal short term buffer state detected\n");
+ }
- if(h->short_ref_count)
- memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
+ if(h->short_ref_count)
+ memmove(&h->short_ref[1], &h->short_ref[0], h->short_ref_count*sizeof(Picture*));
- h->short_ref[0]= s->current_picture_ptr;
- h->short_ref[0]->long_ref=0;
- h->short_ref_count++;
- s->current_picture_ptr->reference |= s->picture_structure;
- }
+ h->short_ref[0]= s->current_picture_ptr;
+ h->short_ref[0]->long_ref=0;
+ h->short_ref_count++;
+ s->current_picture_ptr->reference |= s->picture_structure;
+ }
}
if (h->long_ref_count + h->short_ref_count > h->sps.ref_frame_count){
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list