github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-02 16:25:33 +02:00
Code Releases Activity

fix compilation with old FFmpeg versions

Browse Source 
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
This commit is contained in:
Uoti Urpala 2011-02-08 18:37:05 +02:00
parent cba6d60bcd
commit e1a8392cae
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libaf/af_lavcac3enc.c
View File

@ -298,17 +298,18 @@ static int af_open(af_instance_t* af){
mp_tmsg(MSGT_AFILTER, MSGL_ERR, "Audio LAVC, couldn't allocate context!\n");
return AF_ERROR;
}
const enum AVSampleFormat *fmts = s->lavc_acodec->sample_fmts;
// using deprecated SampleFormat/FMT, AV* versions only added in 2010-11
const enum SampleFormat *fmts = s->lavc_acodec->sample_fmts;
for (int i = 0; ; i++) {
if (fmts[i] == AV_SAMPLE_FMT_NONE) {
if (fmts[i] == SAMPLE_FMT_NONE) {
mp_msg(MSGT_AFILTER, MSGL_ERR, "Audio LAVC, encoder doesn't "
"support expected sample formats!\n");
return AF_ERROR;
} else if (fmts[i] == AV_SAMPLE_FMT_S16) {
} else if (fmts[i] == SAMPLE_FMT_S16) {
s->in_sampleformat = AF_FORMAT_S16_NE;
s->lavc_actx->sample_fmt = fmts[i];
break;
} else if (fmts[i] == AV_SAMPLE_FMT_FLT) {
} else if (fmts[i] == SAMPLE_FMT_FLT) {
s->in_sampleformat = AF_FORMAT_FLOAT_NE;
s->lavc_actx->sample_fmt = fmts[i];
break;

9
libmpcodecs/vd_ffmpeg.c
View File

@ -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;

2
libmpdemux/demux_real.c
View File

@ -43,7 +43,7 @@
#include "mp_msg.h"
#include "mpbswap.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "ffmpeg_files/intreadwrite.h"
#include "stream/stream.h"
#include "aviprint.h"
#include "demuxer.h"

5
stream/http.c
View File

@ -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;

6
stream/realrtsp/real.c
View File

@ -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"