diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-18 17:58:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-18 17:58:58 +0100 |
| commit | 4eb41d16bee406d1481d412639230510015ea708 (patch) | |
| tree | c6fa80c3b060c6a71c43082802974163c911663b /libavformat/avformat.h | |
| parent | 12bcfe05b45175cc7fc5cc719392c35ee5a3c39c (diff) | |
| parent | 350785a6621529c50771f4e7043b4d159a96ed26 (diff) | |
| download | ffmpeg-4eb41d16bee406d1481d412639230510015ea708.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 7990ce7bbe..0471fd6c25 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -534,8 +534,6 @@ typedef struct AVStream { * Only set this if you are absolutely 100% sure that the value you set * it to really is the pts of the first frame. * This may be undefined (AV_NOPTS_VALUE). - * @note The ASF header does NOT contain a correct start_time the ASF - * demuxer must NOT set this. */ int64_t start_time; |