[FFmpeg-soc] [soc]: r5260 - concat/libavformat/avplaylist.c
gkovacs
subversion at mplayerhq.hu
Tue Aug 25 09:00:21 CEST 2009
Author: gkovacs
Date: Tue Aug 25 09:00:21 2009
New Revision: 5260
Log:
don't mix declarations and code
Modified:
concat/libavformat/avplaylist.c
Modified: concat/libavformat/avplaylist.c
==============================================================================
--- concat/libavformat/avplaylist.c Tue Aug 25 08:56:31 2009 (r5259)
+++ concat/libavformat/avplaylist.c Tue Aug 25 09:00:21 2009 (r5260)
@@ -206,11 +206,13 @@ AVPlaylistContext *av_playlist_from_file
int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath)
{
+ int64_t *durations_tmp;
+ int *nb_streams_list_tmp;
ctx->flist = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size+1));
ctx->flist[ctx->pelist_size] = NULL;
ctx->flist[ctx->pelist_size-1] = itempath;
- int64_t *durations_tmp = av_realloc(ctx->durations,
- sizeof(*(ctx->durations)) * (ctx->pelist_size+1));
+ durations_tmp = av_realloc(ctx->durations,
+ sizeof(*(ctx->durations)) * (ctx->pelist_size+1));
if (!durations_tmp) {
av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_add_path\n");
av_free(ctx->durations);
@@ -220,8 +222,8 @@ int av_playlist_add_path(AVPlaylistConte
else
ctx->durations = durations_tmp;
ctx->durations[ctx->pelist_size] = 0;
- int *nb_streams_list_tmp = av_realloc(ctx->nb_streams_list,
- sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size+1));
+ nb_streams_list_tmp = av_realloc(ctx->nb_streams_list,
+ sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size+1));
if (!nb_streams_list_tmp) {
av_log(NULL, AV_LOG_ERROR, "av_realloc error in av_playlist_add_path\n");
av_free(ctx->nb_streams_list);
More information about the FFmpeg-soc
mailing list