generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s/num_chapters/nb_chapters/ all other similar variables are called nb_*.

Browse Source 
Originally committed as revision 13260 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-05-23 13:07:58 +00:00
parent 747fb6c60c
commit 7c8202cc92
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@ -522,7 +522,7 @@ typedef struct AVFormatContext {
*/ */
unsigned int max_picture_buffer; unsigned int max_picture_buffer;
int num_chapters; int nb_chapters;
AVChapter **chapters; AVChapter **chapters;
} AVFormatContext; } AVFormatContext;

10
libavformat/utils.c
View File

@ -2148,9 +2148,9 @@ void av_close_input_stream(AVFormatContext *s)
av_freep(&s->programs); av_freep(&s->programs);
flush_packet_queue(s); flush_packet_queue(s);
av_freep(&s->priv_data); av_freep(&s->priv_data);
while(s->num_chapters--) { while(s->nb_chapters--) {
av_free(s->chapters[s->num_chapters]->title); av_free(s->chapters[s->nb_chapters]->title);
av_free(s->chapters[s->num_chapters]); av_free(s->chapters[s->nb_chapters]);
} }
av_freep(&s->chapters); av_freep(&s->chapters);
av_free(s); 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; AVChapter *chapter = NULL;
int i; int i;
for(i=0; i<s->num_chapters; i++) for(i=0; i<s->nb_chapters; i++)
if(s->chapters[i]->id == id) if(s->chapters[i]->id == id)
chapter = s->chapters[i]; 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)); chapter= av_mallocz(sizeof(AVChapter));
if(!chapter) if(!chapter)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
dynarray_add(&s->chapters, &s->num_chapters, chapter); dynarray_add(&s->chapters, &s->nb_chapters, chapter);
} }
if(chapter->title) if(chapter->title)
av_free(chapter->title); av_free(chapter->title);