From 562a3372f6691418ab39dc30b1d7c888d68be77a Mon Sep 17 00:00:00 2001 From: martii Date: Wed, 24 Jul 2013 20:42:17 +0200 Subject: [PATCH] libeplayer3/containter_ffmpeg: fix track update Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/6a658a2a6d449f53e2bc150b50554403deda488b Author: martii Date: 2013-07-24 (Wed, 24 Jul 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/container_ffmpeg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index c4c30fb..54e8ba9 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -437,7 +437,6 @@ static void FFMPEGThread(Context_t *context) { Track_t * videoTrack = NULL; Track_t * audioTrack = NULL; Track_t * subtitleTrack = NULL; - Track_t * dvbsubtitleTrack = NULL; Track_t * teletextTrack = NULL; @@ -609,7 +608,6 @@ static void FFMPEGThread(Context_t *context) { ((AVStream*) audioTrack->stream)->time_base.den, ((AVStream*) audioTrack->stream)->time_base.num * (int64_t)out_sample_rate * c->sample_rate); currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, next_out_pts); -//fprintf(stderr, "apts=%lld vpts=%lld diff=%lldd\n",pts,videoTrack->pts,pts - videoTrack->pts); out_samples = swr_convert(swr, &output, out_samples, (const uint8_t **) &decoded_frame->data[0], in_samples); pcmPrivateData_t extradata; @@ -959,10 +957,12 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename) unsigned int n; - if (context->manager->audio) - context->manager->audio->Command(context, MANAGER_DEL, NULL); if (context->manager->video) context->manager->video->Command(context, MANAGER_DEL, NULL); + if (context->manager->audio) + context->manager->audio->Command(context, MANAGER_DEL, NULL); + if (context->manager->subtitle) + context->manager->subtitle->Command(context, MANAGER_DEL, NULL); if (context->manager->dvbsubtitle) context->manager->dvbsubtitle->Command(context, MANAGER_DEL, NULL); if (context->manager->teletext)