Merge remote-tracking branch 'qatar/master'

[ffmpeg.git] / libavformat / avformat.h

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index e49e475..36b874b 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -558,7 +558,12 @@ typedef struct AVIndexEntry {
  */
 typedef struct AVStream {
     int index;    /**< stream index in AVFormatContext */
-    int id;       /**< format-specific stream ID */
+    /**
+     * Format-specific stream ID.
+     * decoding: set by libavformat
+     * encoding: set by the user
+     */
+    int id;
     AVCodecContext *codec; /**< codec context */
     /**
      * Real base framerate of the stream.