summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-09 01:45:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-09 01:46:26 +0200
commit5f43a7957b70e44c0256cd223f296f32d2eb36da (patch)
tree2e52cc4bafe6da848bad976a0072125502e469fb /libavcodec
parentaf28960412441c9204a85d4acdb56a74e8d98772 (diff)
parent9f3a70c44224ed92d91df65bb9470a2649e7d019 (diff)
Merge commit '9f3a70c44224ed92d91df65bb9470a2649e7d019'
* commit '9f3a70c44224ed92d91df65bb9470a2649e7d019': dump: print the original coded dimensions when available Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 02ca2dec6f..9dc1c11c35 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3032,6 +3032,12 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
"%dx%d",
enc->width, enc->height);
+ if (av_log_get_level() >= AV_LOG_VERBOSE &&
+ (enc->width != enc->coded_width ||
+ enc->height != enc->coded_height))
+ snprintf(buf + strlen(buf), buf_size - strlen(buf),
+ " (%dx%d)", enc->coded_width, enc->coded_height);
+
if (enc->sample_aspect_ratio.num) {
av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
enc->width * enc->sample_aspect_ratio.num,