diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:12:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:12:25 +0100 |
| commit | 4d941eac1655b21af33c6e4d52b7bfd7f9e5b990 (patch) | |
| tree | 54fb5dafa6b702dc50fe5bd3691ec44679acf055 /libavformat | |
| parent | 62006b539ddda23594febf0fcb2f21c03de60457 (diff) | |
| parent | 3b4296f41473a5b39e84d7a49d480624c9c60040 (diff) | |
| download | ffmpeg-4d941eac1655b21af33c6e4d52b7bfd7f9e5b990.tar.gz | |
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
avformat: clarify stream id for muxing
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
ppc: do not pass redundant compiler flags
avutil: change GET_UTF8 to not use av_log2()
segment: fix NULL pointer dereference in seg_write_header()
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 61bc4a6327..dd9df4ed3d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -641,7 +641,7 @@ typedef struct AVStream { /** * Format-specific stream ID. * decoding: set by libavformat - * encoding: set by the user + * encoding: set by the user, replaced by libavformat if left unset */ int id; /** |