diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-08-08 10:41:32 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-08-12 00:14:13 +0200 |
| commit | 9c29aa7143ba13ba71c70a1454ec35f2da10c3e0 (patch) | |
| tree | a6354f78a256460e730298a7f247913e876f0f29 | |
| parent | 13b3462b7a8570a65d27f4c398c189ed45361096 (diff) | |
| download | ffmpeg-9c29aa7143ba13ba71c70a1454ec35f2da10c3e0.tar.gz | |
ffmpeg: replace deprecated av_log_ask_for_sample with av_log
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | cmdutils.c | 5 | ||||
| -rw-r--r-- | ffmpeg.c | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/cmdutils.c b/cmdutils.c index 78b0094dc0..b696008c87 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -2040,7 +2040,10 @@ double get_rotation(AVStream *st) theta -= 360*floor(theta/360 + 0.9/360); if (fabs(theta - 90*round(theta/90)) > 2) - av_log_ask_for_sample(NULL, "Odd rotation angle\n"); + av_log(NULL, AV_LOG_WARNING, "Odd rotation angle.\n" + "If you want to help, upload a sample " + "of this file to ftp://upload.ffmpeg.org/incoming/ " + "and contact the ffmpeg-devel mailing list. (ffmpeg-devel@ffmpeg.org)"); return theta; } @@ -2063,12 +2063,13 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) if (ist->dec_ctx->codec_id == AV_CODEC_ID_H264) { ist->st->codec->has_b_frames = ist->dec_ctx->has_b_frames; } else - av_log_ask_for_sample( - ist->dec_ctx, - "has_b_frames is larger in decoder than demuxer %d > %d ", - ist->dec_ctx->has_b_frames, - ist->st->codec->has_b_frames - ); + av_log(ist->dec_ctx, AV_LOG_WARNING, + "has_b_frames is larger in decoder than demuxer %d > %d.\n" + "If you want to help, upload a sample " + "of this file to ftp://upload.ffmpeg.org/incoming/ " + "and contact the ffmpeg-devel mailing list. (ffmpeg-devel@ffmpeg.org)", + ist->dec_ctx->has_b_frames, + ist->st->codec->has_b_frames); } if (*got_output || ret<0) |