mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 07:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3/containter_ffmpeg: fix track update

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 6a658a2a6d
Author: martii <m4rtii@gmx.de>
Date: 2013-07-24 (Wed, 24 Jul 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2013-07-24 20:42:17 +02:00
parent 4cfe1743f5
commit 562a3372f6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libeplayer3/container/container_ffmpeg.c
View File

@@ -437,7 +437,6 @@ static void FFMPEGThread(Context_t *context) {
Track_t * videoTrack = NULL; Track_t * videoTrack = NULL;
Track_t * audioTrack = NULL; Track_t * audioTrack = NULL;
Track_t * subtitleTrack = NULL; Track_t * subtitleTrack = NULL;
Track_t * dvbsubtitleTrack = NULL; Track_t * dvbsubtitleTrack = NULL;
Track_t * teletextTrack = 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.den,
((AVStream*) audioTrack->stream)->time_base.num * (int64_t)out_sample_rate * c->sample_rate); ((AVStream*) audioTrack->stream)->time_base.num * (int64_t)out_sample_rate * c->sample_rate);
currentAudioPts = audioTrack->pts = pts = calcPts(audioTrack->stream, next_out_pts); 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); out_samples = swr_convert(swr, &output, out_samples, (const uint8_t **) &decoded_frame->data[0], in_samples);
pcmPrivateData_t extradata; pcmPrivateData_t extradata;
@@ -959,10 +957,12 @@ int container_ffmpeg_update_tracks(Context_t *context, char *filename)
unsigned int n; unsigned int n;
if (context->manager->audio)
context->manager->audio->Command(context, MANAGER_DEL, NULL);
if (context->manager->video) if (context->manager->video)
context->manager->video->Command(context, MANAGER_DEL, NULL); 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) if (context->manager->dvbsubtitle)
context->manager->dvbsubtitle->Command(context, MANAGER_DEL, NULL); context->manager->dvbsubtitle->Command(context, MANAGER_DEL, NULL);
if (context->manager->teletext) if (context->manager->teletext)