diff options
Diffstat (limited to 'src/lib/ffmpeg_content.h')
| -rw-r--r-- | src/lib/ffmpeg_content.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index d1aa3a0b5..2339705d0 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -37,7 +37,7 @@ class FFmpegStream public: FFmpegStream (std::string n, int i) : name (n) - , id (i) + , _id (i) , _legacy_id (false) {} @@ -52,10 +52,16 @@ public: bool uses_index (AVFormatContext const * c, int index) const; AVStream* stream (AVFormatContext const * c) const; + int id () const { + return _id; + } std::string name; - int id; + + friend bool operator== (FFmpegStream const & a, FFmpegStream const & b); + friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b); private: + int _id; /** If this is true, id is in fact the index */ bool _legacy_id; }; @@ -93,9 +99,6 @@ private: {} }; -extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b); -extern bool operator!= (FFmpegAudioStream const & a, FFmpegAudioStream const & b); - class FFmpegSubtitleStream : public FFmpegStream { public: @@ -108,9 +111,6 @@ public: void as_xml (xmlpp::Node *) const; }; -extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b); -extern bool operator!= (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b); - class FFmpegContentProperty : public VideoContentProperty { public: |