diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-25 01:56:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-25 01:56:53 +0100 |
| commit | 8bf95e8bd5c20eb940bd9583d3f947d8210eeb56 (patch) | |
| tree | 43936a02f5da95392199e07b1ad38980e0ac2bc8 /libavformat/avformat.h | |
| parent | f4c380a5e65c60422c6f62cab7bfe6155276d11d (diff) | |
| parent | d5ed5e7d0c1fa46de348db0de4c82b0f621db3d4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avc: Add a function for converting mp4 style extradata to annex b
pthread: free progress if buffer allocation failed.
lavc/avconv: support changing frame sizes in codecs with frame mt.
libavformat: Document who sets the AVStream.id field
utvideo: mark output picture as keyframe.
sunrast: Add support for negative linesize.
vp8: fix update_lf_deltas in libavcodec/vp8.c
ralf: read Huffman code lengths without GetBitContext
Conflicts:
ffmpeg.c
libavcodec/sunrastenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e49e475e55..36b874ba15 100644 --- 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. |