virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

reverts parts of commit de11ee906e. The author of this patch has a poor understanding of the code

Browse Source
This commit is contained in:
Michael Niedermayer 2011-03-18 13:16:14 +01:00
parent 4eb41d16be
commit 133055c5e4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/asfdec.c
View File

@ -235,7 +235,6 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
if (!asf_st) if (!asf_st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->priv_data = asf_st; st->priv_data = asf_st;
st->start_time = 0;
start_time = asf->hdr.preroll; start_time = asf->hdr.preroll;
asf_st->stream_language_index = 128; // invalid stream index means no language info asf_st->stream_language_index = 128; // invalid stream index means no language info

2
libavformat/avformat.h
View File

@ -534,6 +534,8 @@ typedef struct AVStream {
* Only set this if you are absolutely 100% sure that the value you set * Only set this if you are absolutely 100% sure that the value you set
* it to really is the pts of the first frame. * it to really is the pts of the first frame.
* This may be undefined (AV_NOPTS_VALUE). * 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; int64_t start_time;