diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-08-10 15:50:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-08-10 15:50:21 +0100 |
| commit | 7b76135b6c7082815fb4fe1e703f3f15182e6bf3 (patch) | |
| tree | a2b150086a4457c63a78cc57055a031fd23e4589 /src/lib/ffmpeg_decoder.h | |
| parent | 0b8dfcc3d112300be133afd01e4102881fa15977 (diff) | |
| parent | 233e299a347b00219f8d154d0a8b0a46a4fc20c1 (diff) | |
Merge.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 8e7d68580..4e5445f67 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -79,13 +79,13 @@ private: AVFormatContext* _format_context; int _video_stream; - int _audio_stream; + int _audio_stream; ///< may be < 0 if there is no audio AVFrame* _frame; AVCodecContext* _video_codec_context; AVCodec* _video_codec; - AVCodecContext* _audio_codec_context; - AVCodec* _audio_codec; + AVCodecContext* _audio_codec_context; ///< may be 0 if there is no audio + AVCodec* _audio_codec; ///< may be 0 if there is no audio AVPacket _packet; }; |