[FFmpeg-cvslog] ffprobe: Initialize coded_width/height
Zhong Li
git at videolan.org
Fri Feb 2 21:41:38 EET 2018
ffmpeg | branch: master | Zhong Li <zhong.li at intel.com> | Fri Jan 19 13:05:55 2018 +0800| [19b1d905b88d32a86511219585eae6afda23dfbd] | committer: James Almer
ffprobe: Initialize coded_width/height
coded_width/height are unnitialized and will be overwritten by
dec_ctx->width/height in avcodec_open2()
This fixes tiket #6958.
Signed-off-by: Zhong Li <zhong.li at intel.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19b1d905b88d32a86511219585eae6afda23dfbd
---
fftools/ffprobe.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c
index acb403e3b1..fc3a14a807 100644
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@@ -2512,10 +2512,12 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id
case AVMEDIA_TYPE_VIDEO:
print_int("width", par->width);
print_int("height", par->height);
+#if FF_API_LAVF_AVCTX
if (dec_ctx) {
print_int("coded_width", dec_ctx->coded_width);
print_int("coded_height", dec_ctx->coded_height);
}
+#endif
print_int("has_b_frames", par->video_delay);
sar = av_guess_sample_aspect_ratio(fmt_ctx, stream, NULL);
if (sar.den) {
@@ -2912,6 +2914,12 @@ static int open_input_file(InputFile *ifile, const char *filename)
ist->dec_ctx->pkt_timebase = stream->time_base;
ist->dec_ctx->framerate = stream->avg_frame_rate;
+#if FF_API_LAVF_AVCTX
+FF_DISABLE_DEPRECATION_WARNINGS
+ ist->dec_ctx->coded_width = stream->codec->coded_width;
+ ist->dec_ctx->coded_height = stream->codec->coded_height;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
if (avcodec_open2(ist->dec_ctx, codec, &opts) < 0) {
av_log(NULL, AV_LOG_WARNING, "Could not open codec for input stream %d\n",
More information about the ffmpeg-cvslog
mailing list