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

Merge remote-tracking branch 'martiis-libstb-hal/master'

Browse Source
This commit is contained in:
max10
2014-05-24 14:10:29 +02:00
parent df3a3db513 9ac03e1046
commit 71ce14be99
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
/m4/ /m4/
/autom4te.cache/ /autom4te.cache/
/aclocal.m4 /aclocal.m4
/compile
/config.guess /config.guess
/config.h.in /config.h.in
/config.h.in~ /config.h.in~

16
libeplayer3/input.cpp
View File

@@ -262,10 +262,22 @@ bool Input::Play()
return res; return res;
} }
static std::string lastlog_message;
static unsigned int lastlog_repeats;
static void log_callback(void *ptr __attribute__ ((unused)), int lvl __attribute__ ((unused)), const char *format, va_list ap) static void log_callback(void *ptr __attribute__ ((unused)), int lvl __attribute__ ((unused)), const char *format, va_list ap)
{ {
// if (debug_level > 10) char m[1024];
vfprintf(stderr, format, ap); if (sizeof(m) - 1 > (unsigned int) vsnprintf(m, sizeof(m), format, ap)) {
if (lastlog_message.compare(m) || lastlog_repeats > 999) {
if (lastlog_repeats)
fprintf(stderr, "last message repeated %u times\n", lastlog_repeats);
lastlog_message = m;
lastlog_repeats = 0;
fprintf(stderr, "%s", m);
} else
lastlog_repeats++;
}
} }
bool Input::ReadSubtitle(const char *filename, const char *format, int pid) bool Input::ReadSubtitle(const char *filename, const char *format, int pid)

8
libeplayer3/writer/pcm.cpp
View File

@@ -311,8 +311,11 @@ bool WriterPCM::Write(AVPacket *packet, int64_t pts)
break; break;
} }
if (packet->data)
packet_size -= len;
if (!got_frame) { if (!got_frame) {
if (!packet->data) if (!packet->data || !packet_size)
break; break;
continue; continue;
} }
@@ -338,9 +341,6 @@ bool WriterPCM::Write(AVPacket *packet, int64_t pts)
} }
pts = 0; pts = 0;
if (packet->data)
packet_size -= len;
} }
return !packet_size; return !packet_size;
} }