highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  Do not warn about missing start time for unknown streams.
  Only complain about missing frame rate for video streams.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-21 18:45:11 +01:00
parent a0f8e6ad67 f5fe6a4f79
commit c8f3c3a579
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/utils.c
View File

@@ -2382,7 +2382,9 @@ static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset)
for (i = 0; i < ic->nb_streams; i++) { for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i]; st = ic->streams[i];
if (st->start_time == AV_NOPTS_VALUE && st->first_dts == AV_NOPTS_VALUE) if (st->start_time == AV_NOPTS_VALUE &&
st->first_dts == AV_NOPTS_VALUE &&
st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN)
av_log(st->codec, AV_LOG_WARNING, av_log(st->codec, AV_LOG_WARNING,
"start time is not set in estimate_timings_from_pts\n"); "start time is not set in estimate_timings_from_pts\n");
@@ -3062,6 +3064,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
for (i = 0; i < ic->nb_streams; i++) for (i = 0; i < ic->nb_streams; i++)
if (!ic->streams[i]->r_frame_rate.num && if (!ic->streams[i]->r_frame_rate.num &&
ic->streams[i]->info->duration_count <= 1 && ic->streams[i]->info->duration_count <= 1 &&
ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
strcmp(ic->iformat->name, "image2")) strcmp(ic->iformat->name, "image2"))
av_log(ic, AV_LOG_WARNING, av_log(ic, AV_LOG_WARNING,
"Stream #%d: not enough frames to estimate rate; " "Stream #%d: not enough frames to estimate rate; "