diff options
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/allformats.c | 6 | ||||
-rw-r--r-- | libavformat/nutdec.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index be27055801..5cafd6209d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -40,11 +40,11 @@ */ void av_register_all(void) { - static int inited; + static int initialized; - if (inited) + if (initialized) return; - inited = 1; + initialized = 1; avcodec_init(); avcodec_register_all(); diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 1519a652c3..b637bb4f4b 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -531,7 +531,7 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) NUTContext *nut = s->priv_data; ByteIOContext *bc = s->pb; int64_t pos; - int inited_stream_count; + int initialized_stream_count; nut->avf= s; @@ -547,14 +547,14 @@ static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) /* stream headers */ pos=0; - for(inited_stream_count=0; inited_stream_count < s->nb_streams;){ + for(initialized_stream_count=0; initialized_stream_count < s->nb_streams;){ pos= find_startcode(bc, STREAM_STARTCODE, pos)+1; if (pos<0+1){ av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n"); return -1; } if(decode_stream_header(nut) >= 0) - inited_stream_count++; + initialized_stream_count++; } /* info headers */ |