diff options
| author | Max Kellermann <max@duempel.org> | 2012-10-05 16:35:45 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-10-05 16:37:07 +0200 |
| commit | e39382dedd224a97a896034c43772fa3da924b15 (patch) | |
| tree | 84e31b875c9f6c0ce3960c6e6e4cfdedcca76f46 | |
| parent | fd016f45074cc5afd114163fb2d9390022e2e7d5 (diff) | |
| download | mpd-e39382dedd224a97a896034c43772fa3da924b15.tar.gz mpd-e39382dedd224a97a896034c43772fa3da924b15.tar.xz mpd-e39382dedd224a97a896034c43772fa3da924b15.zip | |
decoder/ffmpeg: ignore negative time stamps
Works around assertion failure in decoder_timestamp().
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -4,6 +4,8 @@ ver 0.17.3 (2012/??/??) - recorder: fix I/O error check - shout: fix memory leak in error handler - recorder, shout: support Ogg packets that span more than one page +* decoder: + - ffmpeg: ignore negative time stamps ver 0.17.2 (2012/09/30) * protocol: diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index bab6968e8..64227b85a 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -273,7 +273,7 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, AVCodecContext *codec_context, const AVRational *time_base) { - if (packet->pts != (int64_t)AV_NOPTS_VALUE) + if (packet->pts >= 0 && packet->pts != (int64_t)AV_NOPTS_VALUE) decoder_timestamp(decoder, time_from_ffmpeg(packet->pts, *time_base)); |