From 8ca3766f007dc9684535d2d5674710108ba58dc3 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 25 Jul 2013 10:52:15 +0200 Subject: [PATCH 1/2] Allow native compilation on the iPhone. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index c9ad9483c6..398a62b250 100755 --- a/configure +++ b/configure @@ -3080,7 +3080,7 @@ case "$arch" in aarch64|arm64) arch="aarch64" ;; - arm*|iPad*) + arm*|iPad*|iPhone*) arch="arm" ;; mips*|IP*) From 9375879d57022ea4c9d6e822e94b3579e6a743c5 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 25 Jul 2013 10:53:47 +0200 Subject: [PATCH 2/2] Show max bitrate for mpeg2 video streams in avcodec_string(). See also 25b7aa9 --- libavcodec/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 20d487c52e..50448b4a85 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2650,6 +2650,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) if (bitrate != 0) { snprintf(buf + strlen(buf), buf_size - strlen(buf), ", %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); } }