diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-23 21:22:29 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-23 21:58:44 +0200 |
| commit | f1027ed198535ce16cfb9c83ac802788ec750488 (patch) | |
| tree | bc8787407538be55e8bf70d3413644a8a8f4abf4 /src/decoder/FfmpegDecoderPlugin.cxx | |
| parent | fe3c5e4e8e3c46d57cb49c2dd6c4c2dc814a797b (diff) | |
| download | mpd-f1027ed198535ce16cfb9c83ac802788ec750488.tar.gz mpd-f1027ed198535ce16cfb9c83ac802788ec750488.tar.xz mpd-f1027ed198535ce16cfb9c83ac802788ec750488.zip | |
InputStream: add method Rewind()
Diffstat (limited to 'src/decoder/FfmpegDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/FfmpegDecoderPlugin.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index 5092bdf9e..cba7f5e2d 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -31,15 +31,6 @@ #include "util/Domain.hxx" #include "LogV.hxx" -#include <assert.h> -#include <stdio.h> -#include <unistd.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> - extern "C" { #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> @@ -50,6 +41,9 @@ extern "C" { #include <libavutil/dict.h> } +#include <assert.h> +#include <string.h> + static constexpr Domain ffmpeg_domain("ffmpeg"); /* suppress the ffmpeg compatibility macro */ @@ -352,7 +346,7 @@ ffmpeg_probe(Decoder *decoder, struct input_stream *is) unsigned char buffer[BUFFER_SIZE]; size_t nbytes = decoder_read(decoder, is, buffer, BUFFER_SIZE); - if (nbytes <= PADDING || !is->LockSeek(0, SEEK_SET, error)) + if (nbytes <= PADDING || !is->LockRewind(error)) return nullptr; /* some ffmpeg parsers (e.g. ac3_parser.c) read a few bytes |