apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-23 17:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'

Browse Source 
* commit '28816050e47b6dba430a52e429d21a864cffda8e':
  lavf: Set the stream time base hint properly for chained muxers

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-07 02:51:08 +02:00
parent 4db0e8fd33 28816050e4
commit 3726d07a2a
5 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/segment.c
View File

@@ -162,6 +162,7 @@ static int segment_mux_init(AVFormatContext *s)
ocodec->codec_tag = 0;
}
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
st->time_base = s->streams[i]->time_base;
av_dict_copy(&st->metadata, s->streams[i]->metadata, 0);
}