mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 15:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: fix merge errors

Browse Source
This commit is contained in:
Stefan Seyfried
2013-11-09 22:45:13 +01:00
parent 068769c110
commit a2a4651c46
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libeplayer3/container/container_ffmpeg.c
View File

@@ -436,7 +436,6 @@ static void FFMPEGThread(Context_t *context) {
Track_t * subtitleTrack = NULL; Track_t * subtitleTrack = NULL;
Track_t * dvbsubtitleTrack = NULL; Track_t * dvbsubtitleTrack = NULL;
Track_t * teletextTrack = NULL; Track_t * teletextTrack = NULL;
#endif
context->playback->readCount += packet.size; context->playback->readCount += packet.size;
@@ -500,7 +499,7 @@ static void FFMPEGThread(Context_t *context) {
avOut.data = packet.data; avOut.data = packet.data;
avOut.len = packet.size; avOut.len = packet.size;
avOut.pts = pts; avOut.pts = pts;
avOut.extradata = &extradata; avOut.extradata = (unsigned char *) &extradata;
avOut.extralen = sizeof(extradata); avOut.extralen = sizeof(extradata);
avOut.frameRate = 0; avOut.frameRate = 0;
avOut.timeScale = 0; avOut.timeScale = 0;
@@ -513,7 +512,6 @@ static void FFMPEGThread(Context_t *context) {
ffmpeg_err("(raw pcm) writing data to audio device failed\n"); ffmpeg_err("(raw pcm) writing data to audio device failed\n");
} }
} }
else if (audioTrack->inject_as_pcm == 1) else if (audioTrack->inject_as_pcm == 1)
{ {
AVCodecContext *c = ((AVStream*)(audioTrack->stream))->codec; AVCodecContext *c = ((AVStream*)(audioTrack->stream))->codec;

2
libeplayer3/output/writer/pes.c
View File

@@ -90,8 +90,6 @@ int InsertPesHeader (unsigned char *data, int size, unsigned char stream_id, uns
{ {
BitPacker_t ld2 = {data, 0, 32}; BitPacker_t ld2 = {data, 0, 32};
#if 0
/* does not seem to hurt, at least with h264 data...? */
if (size > MAX_PES_PACKET_SIZE) if (size > MAX_PES_PACKET_SIZE)
size = 0; // unbounded size = 0; // unbounded