diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-05-23 13:07:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-05-23 13:07:58 +0000 |
| commit | 7c8202cc923386a3684a860385af77803965bdd6 (patch) | |
| tree | 2e9b5735891daa5978f9e8ff0f39e34bf1e89961 | |
| parent | 747fb6c60c2d89f86ba4c1ff5985633ed1b77fec (diff) | |
| download | ffmpeg-7c8202cc923386a3684a860385af77803965bdd6.tar.gz | |
s/num_chapters/nb_chapters/ all other similar variables are called nb_*.
Originally committed as revision 13260 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a2e0978e9d..8774b7366a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -522,7 +522,7 @@ typedef struct AVFormatContext { */ unsigned int max_picture_buffer; - int num_chapters; + int nb_chapters; AVChapter **chapters; } AVFormatContext; diff --git a/libavformat/utils.c b/libavformat/utils.c index 7986d49d32..5f5909bd1d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2148,9 +2148,9 @@ void av_close_input_stream(AVFormatContext *s) av_freep(&s->programs); flush_packet_queue(s); av_freep(&s->priv_data); - while(s->num_chapters--) { - av_free(s->chapters[s->num_chapters]->title); - av_free(s->chapters[s->num_chapters]); + while(s->nb_chapters--) { + av_free(s->chapters[s->nb_chapters]->title); + av_free(s->chapters[s->nb_chapters]); } av_freep(&s->chapters); av_free(s); @@ -2239,7 +2239,7 @@ int ff_new_chapter(AVFormatContext *s, int id, int64_t start, int64_t end, const AVChapter *chapter = NULL; int i; - for(i=0; i<s->num_chapters; i++) + for(i=0; i<s->nb_chapters; i++) if(s->chapters[i]->id == id) chapter = s->chapters[i]; @@ -2247,7 +2247,7 @@ int ff_new_chapter(AVFormatContext *s, int id, int64_t start, int64_t end, const chapter= av_mallocz(sizeof(AVChapter)); if(!chapter) return AVERROR(ENOMEM); - dynarray_add(&s->chapters, &s->num_chapters, chapter); + dynarray_add(&s->chapters, &s->nb_chapters, chapter); } if(chapter->title) av_free(chapter->title); |