summaryrefslogtreecommitdiff
path: root/src/lib/decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-31 01:53:44 +0000
committerCarl Hetherington <cth@carlh.net>2012-10-31 01:53:44 +0000
commit3ed5df31baed21633d0db9167cd75562f384dec7 (patch)
tree6572255be2e6e9ca74fda5014429a4a19d236d97 /src/lib/decoder.h
parentd5073736c5971ab35b20a195c52f70c3832b2cac (diff)
Fix up parent / child member naming confusion.
Diffstat (limited to 'src/lib/decoder.h')
-rw-r--r--src/lib/decoder.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 31cf9d97d..2af9157b4 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -81,8 +81,8 @@ public:
void go ();
/** @return the index of the last video frame to be processed */
- int video_frame () const {
- return _video_frame;
+ int video_frame_index () const {
+ return _video_frame_index;
}
virtual std::vector<AudioStream> audio_streams () const {
@@ -134,7 +134,7 @@ private:
void emit_audio (uint8_t* data, int size);
/** last video frame to be processed */
- int _video_frame;
+ int _video_frame_index;
std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;