diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-08 18:37:05 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-02-08 19:07:10 +0200 |
| commit | e1a8392cae584ddce6a92d88bda47e7f366769cf (patch) | |
| tree | 5977700a89f12da7fc3773320918b6246604a93b /stream | |
| parent | cba6d60bcd2e51dfd9a42007c0421e7635e78a9c (diff) | |
| download | mpv-e1a8392cae584ddce6a92d88bda47e7f366769cf.tar.bz2 mpv-e1a8392cae584ddce6a92d88bda47e7f366769cf.tar.xz | |
fix compilation with old FFmpeg versions
af_lavcac3enc: use old SampleFormat names without AV_ prefix, the
latter were only added in 2010-11
vd_ffmpeg: add ifdef around CODEC_ID_LAGARITH use
demux_real: use ffmpeg_files/intreadwrite.h
stream/http.c, stream/realrtsp/real.c: define AV_BASE64_SIZE macro for
old libavutil versions lacking it
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/http.c | 5 | ||||
| -rw-r--r-- | stream/realrtsp/real.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/stream/http.c b/stream/http.c index 9ef5ae8446..9372cb1262 100644 --- a/stream/http.c +++ b/stream/http.c @@ -43,6 +43,11 @@ #include "libavutil/base64.h" +#include <libavutil/avutil.h> +#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 17, 0) +#define AV_BASE64_SIZE(x) (((x)+2) / 3 * 4 + 1) +#endif + extern int stream_cache_size; extern int network_bandwidth; diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c index 6d77157f34..3ddf9a12d0 100644 --- a/stream/realrtsp/real.c +++ b/stream/realrtsp/real.c @@ -39,6 +39,12 @@ #include "libavutil/md5.h" #include "ffmpeg_files/intreadwrite.h" #include "libavutil/base64.h" + +#include <libavutil/avutil.h> +#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 17, 0) +#define AV_BASE64_SIZE(x) (((x)+2) / 3 * 4 + 1) +#endif + #include "stream/http.h" #include "mp_msg.h" |