From aa46b435b8abe11e2afd2edfca6e04261eb37971 Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 21 Jul 2013 19:50:14 +0200 Subject: [PATCH] libeplayer/container_ffmpeg: correct misplaced brackets Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/093fcac8fdfaccc883b32fe21e4ecf07da1f1ff1 Author: martii Date: 2013-07-21 (Sun, 21 Jul 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/container_ffmpeg.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 693ccd8..af90ada 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -669,9 +669,7 @@ static void FFMPEGThread(Context_t *context) { ffmpeg_err("writing data to audio device failed\n"); } } - } - - if (subtitleTrack && (subtitleTrack->Id == pid)) { + } else if (subtitleTrack && (subtitleTrack->Id == pid)) { float duration=3.0; ffmpeg_printf(100, "subtitleTrack->stream %p \n", subtitleTrack->stream); @@ -818,14 +816,14 @@ static void FFMPEGThread(Context_t *context) { //ffmpeg_err("writing data to teletext fifo failed\n"); } } - - if (packet.data) - av_free_packet(&packet); } + + if (packet.data) + av_free_packet(&packet); else { - ffmpeg_err("no data ->end of file reached ? \n"); - releaseMutex(FILENAME, __FUNCTION__,__LINE__); - break; + ffmpeg_err("no data ->end of file reached ? \n"); + releaseMutex(FILENAME, __FUNCTION__,__LINE__); + break; } releaseMutex(FILENAME, __FUNCTION__,__LINE__);