aboutsummaryrefslogtreecommitdiff
path: root/src/input/FfmpegInputPlugin.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-28 20:32:23 +0100
committerMax Kellermann <max@duempel.org>2013-01-28 23:29:43 +0100
commitdcf55c7e328578d435eb14277cb6ba9e072f7e9c (patch)
tree0488d2de5ecfd090cce2e00cfbc4cdcd342c8194 /src/input/FfmpegInputPlugin.cxx
parente565cd440497d3b693e281046af485c667491441 (diff)
InputStream: add constructor/destructor
Eliminate input_stream_init() and input_stream_deinit().
Diffstat (limited to 'src/input/FfmpegInputPlugin.cxx')
-rw-r--r--src/input/FfmpegInputPlugin.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/FfmpegInputPlugin.cxx
index 2e44f74b..1660f177 100644
--- a/src/input/FfmpegInputPlugin.cxx
+++ b/src/input/FfmpegInputPlugin.cxx
@@ -44,10 +44,8 @@ struct FfmpegInputStream {
FfmpegInputStream(const char *uri, Mutex &mutex, Cond &cond,
AVIOContext *_h)
- :h(_h), eof(false) {
- input_stream_init(&base, &input_plugin_ffmpeg,
- uri, mutex, cond);
-
+ :base(input_plugin_ffmpeg, uri, mutex, cond),
+ h(_h), eof(false) {
base.ready = true;
base.seekable = (h->seekable & AVIO_SEEKABLE_NORMAL) != 0;
base.size = avio_size(h);
@@ -61,7 +59,6 @@ struct FfmpegInputStream {
~FfmpegInputStream() {
avio_close(h);
- input_stream_deinit(&base);
}
};