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 /libmpcodecs | |
| 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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 058446936d..d56a63ea59 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -192,7 +192,14 @@ static int init(sh_video_t *sh){ if(sh->opts->vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) ctx->do_slices=1; - if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264 && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_ROQ && lavc_codec->id != CODEC_ID_VP8 && lavc_codec->id != CODEC_ID_LAGARITH) + if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug + && lavc_codec->id != CODEC_ID_H264 + && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO + && lavc_codec->id != CODEC_ID_ROQ && lavc_codec->id != CODEC_ID_VP8 +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 108, 0) + && lavc_codec->id != CODEC_ID_LAGARITH +#endif + ) ctx->do_dr1=1; ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64; ctx->ip_count= ctx->b_count= 0; |