Commit 1af92119 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Show max bitrate for mpeg2 video streams in avcodec_string().
  Allow native compilation on the iPhone.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents fd84b6fd 9375879d
...@@ -3080,7 +3080,7 @@ case "$arch" in ...@@ -3080,7 +3080,7 @@ case "$arch" in
aarch64|arm64) aarch64|arm64)
arch="aarch64" arch="aarch64"
;; ;;
arm*|iPad*) arm*|iPad*|iPhone*)
arch="arm" arch="arm"
;; ;;
mips*|IP*) mips*|IP*)
......
...@@ -2650,6 +2650,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) ...@@ -2650,6 +2650,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
if (bitrate != 0) { if (bitrate != 0) {
snprintf(buf + strlen(buf), buf_size - strlen(buf), snprintf(buf + strlen(buf), buf_size - strlen(buf),
", %d kb/s", bitrate / 1000); ", %d kb/s", bitrate / 1000);
} else if (enc->rc_max_rate > 0) {
snprintf(buf + strlen(buf), buf_size - strlen(buf),
", max. %d kb/s", enc->rc_max_rate / 1000);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment