RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vd_ffmpeg: fix compilation with neither VDPAU nor XvMC enabled 

The get_format() function was defined under
 #if CONFIG_XVMC || CONFIG_VDPAU
but recent commit ca217f4557 added an
unconditional reference to it, causing linking to fail with an
undefined reference if neither feature was enabled. Fix by removing
the #if, there's no reason reason why it would be needed.
This commit is contained in:
Uoti Urpala 2010-01-21 00:58:06 +02:00
parent 1ef8d887d4
commit ffc3db2239
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpcodecs/vd_ffmpeg.c
View File

@ -864,7 +864,6 @@ static struct mp_image *decode(struct sh_video *sh, void *data, int len,
return mpi;
}
#if CONFIG_XVMC || CONFIG_VDPAU
static enum PixelFormat get_format(struct AVCodecContext *avctx,
const enum PixelFormat *fmt){
enum PixelFormat selected_format;
@ -883,7 +882,6 @@ static enum PixelFormat get_format(struct AVCodecContext *avctx,
selected_format = fmt[i];
return selected_format;
}
#endif /* CONFIG_XVMC || CONFIG_VDPAU */
const struct vd_functions mpcodecs_vd_ffmpeg = {
.info = &info,