diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-25 22:50:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-25 22:50:51 +0200 |
| commit | 1af921196fbc7e2ddd043c56054bdbafc15a85f6 (patch) | |
| tree | 7f2deb54585d54ad0405c45181eadbf274a60478 | |
| parent | fd84b6fd3389ffe3f1841e58438f60f114742771 (diff) | |
| parent | 9375879d57022ea4c9d6e822e94b3579e6a743c5 (diff) | |
| download | ffmpeg-1af921196fbc7e2ddd043c56054bdbafc15a85f6.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/utils.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -3080,7 +3080,7 @@ case "$arch" in aarch64|arm64) arch="aarch64" ;; - arm*|iPad*) + arm*|iPad*|iPhone*) arch="arm" ;; mips*|IP*) 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); } } |