[SCM] libav/experimental: Improve wording: s/reseted/reset
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:48:13 UTC 2013
The following commit has been merged in the experimental branch:
commit c173a0881fd669930b1dbf18f9f8436764662eb4
Author: Haruhiko Yamagata <h.yamagata at nifty.com>
Date: Wed Jun 24 12:10:20 2009 +0000
Improve wording: s/reseted/reset
Patch by Haruhiko Yamagata, h D yamagata A nifty D com
Originally committed as revision 19266 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 368ccbf..40ba4eb 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2240,7 +2240,7 @@ static int frame_start(H264Context *h){
* See decode_nal_units().
*/
s->current_picture_ptr->key_frame= 0;
- s->current_picture_ptr->mmco_reseted= 0;
+ s->current_picture_ptr->mmco_reset= 0;
assert(s->linesize && s->uvlinesize);
@@ -3370,7 +3370,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
h->poc_msb=
h->frame_num=
s->current_picture_ptr->frame_num= 0;
- s->current_picture_ptr->mmco_reseted=1;
+ s->current_picture_ptr->mmco_reset=1;
break;
default: assert(0);
}
@@ -7710,7 +7710,7 @@ static int decode_frame(AVCodecContext *avctx,
//FIXME factorize this with the output code below
out = h->delayed_pic[0];
out_idx = 0;
- for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reseted; i++)
+ for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++)
if(h->delayed_pic[i]->poc < out->poc){
out = h->delayed_pic[i];
out_idx = i;
@@ -7886,12 +7886,12 @@ static int decode_frame(AVCodecContext *avctx,
out = h->delayed_pic[0];
out_idx = 0;
- for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reseted; i++)
+ for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame && !h->delayed_pic[i]->mmco_reset; i++)
if(h->delayed_pic[i]->poc < out->poc){
out = h->delayed_pic[i];
out_idx = i;
}
- cross_idr = !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reseted;
+ cross_idr = !!h->delayed_pic[i] || h->delayed_pic[0]->key_frame || h->delayed_pic[0]->mmco_reset;
out_of_order = !cross_idr && out->poc < h->outputed_poc;
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 791dfc6..181a9cd 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -116,7 +116,7 @@ typedef struct Picture{
int field_poc[2]; ///< h264 top/bottom POC
int poc; ///< h264 frame POC
int frame_num; ///< h264 frame_num (raw frame_num from slice header)
- int mmco_reseted; ///< h264 MMCO_RESET set this 1. Reordering code must not mix pictures before and after MMCO_RESET.
+ int mmco_reset; ///< h264 MMCO_RESET set this 1. Reordering code must not mix pictures before and after MMCO_RESET.
int pic_id; /**< h264 pic_num (short -> no wrap version of pic_num,
pic_num & max_pic_num; long -> long_pic_num) */
int long_ref; ///< 1->long term reference 0->short term reference
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list