Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
37efc237
Commit
37efc237
authored
Mar 05, 2014
by
Rémi Denis-Courmont
Browse files
vdpau: remove dead code
parent
06904b8f
Changes
3
Hide whitespace changes
Inline
Side-by-side
modules/codec/avcodec/avcommon_compat.h
View file @
37efc237
...
...
@@ -479,10 +479,6 @@ enum {
# define err_recognition error_recognition
#endif
#if LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR <= 42 && LIBAVCODEC_VERSION_MICRO >= 100
# define av_vdpau_alloc_context av_alloc_vdpaucontext
#endif
#endif
/* HAVE_LIBAVCODEC_AVCODEC_H */
#ifdef HAVE_LIBAVUTIL_AVUTIL_H
...
...
modules/codec/avcodec/hwdummy.c
View file @
37efc237
...
...
@@ -34,7 +34,6 @@
#include
<vlc_fourcc.h>
#include
<vlc_picture.h>
#include
"../../codec/avcodec/va.h"
#include
"../../codec/avcodec/avcommon_compat.h"
static
int
Open
(
vlc_va_t
*
,
AVCodecContext
*
,
const
es_format_t
*
);
static
void
Close
(
vlc_va_t
*
);
...
...
modules/hw/vdpau/avcodec.c
View file @
37efc237
...
...
@@ -37,7 +37,6 @@
#include
<vlc_xlib.h>
#include
"vlc_vdpau.h"
#include
"../../codec/avcodec/va.h"
#include
"../../codec/avcodec/avcommon_compat.h"
static
int
Open
(
vlc_va_t
*
,
AVCodecContext
*
,
const
es_format_t
*
);
static
void
Close
(
vlc_va_t
*
);
...
...
@@ -170,53 +169,6 @@ static int Setup(vlc_va_t *va, void **ctxp, vlc_fourcc_t *chromap,
return
Init
(
va
,
ctxp
,
chromap
,
width
,
height
);
}
#if LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR <= 42 && LIBAVCODEC_VERSION_MICRO >= 100
static
inline
int
av_vdpau_get_profile
(
AVCodecContext
*
avctx
,
VdpDecoderProfile
*
profile
)
{
#define PROFILE(prof) \
do { \
*profile = prof; \
return 0; \
} while (0)
switch
(
avctx
->
codec_id
)
{
case
AV_CODEC_ID_MPEG1VIDEO
:
PROFILE
(
VDP_DECODER_PROFILE_MPEG1
);
case
AV_CODEC_ID_MPEG2VIDEO
:
switch
(
avctx
->
profile
)
{
case
FF_PROFILE_MPEG2_MAIN
:
PROFILE
(
VDP_DECODER_PROFILE_MPEG2_MAIN
);
case
FF_PROFILE_MPEG2_SIMPLE
:
PROFILE
(
VDP_DECODER_PROFILE_MPEG2_SIMPLE
);
default:
return
AVERROR
(
EINVAL
);
}
case
AV_CODEC_ID_H263
:
PROFILE
(
VDP_DECODER_PROFILE_MPEG4_PART2_ASP
);
case
AV_CODEC_ID_MPEG4
:
switch
(
avctx
->
profile
)
{
case
FF_PROFILE_MPEG4_SIMPLE
:
PROFILE
(
VDP_DECODER_PROFILE_MPEG4_PART2_SP
);
case
FF_PROFILE_MPEG4_ADVANCED_SIMPLE
:
PROFILE
(
VDP_DECODER_PROFILE_MPEG4_PART2_ASP
);
default:
return
AVERROR
(
EINVAL
);
}
case
AV_CODEC_ID_H264
:
switch
(
avctx
->
profile
)
{
case
FF_PROFILE_H264_CONSTRAINED_BASELINE
:
case
FF_PROFILE_H264_BASELINE
:
PROFILE
(
VDP_DECODER_PROFILE_H264_BASELINE
);
case
FF_PROFILE_H264_MAIN
:
PROFILE
(
VDP_DECODER_PROFILE_H264_MAIN
);
case
FF_PROFILE_H264_HIGH
:
PROFILE
(
VDP_DECODER_PROFILE_H264_HIGH
);
default:
return
AVERROR
(
EINVAL
);
}
case
AV_CODEC_ID_WMV3
:
case
AV_CODEC_ID_VC1
:
switch
(
avctx
->
profile
)
{
case
FF_PROFILE_VC1_SIMPLE
:
PROFILE
(
VDP_DECODER_PROFILE_VC1_SIMPLE
);
case
FF_PROFILE_VC1_MAIN
:
PROFILE
(
VDP_DECODER_PROFILE_VC1_MAIN
);
case
FF_PROFILE_VC1_ADVANCED
:
PROFILE
(
VDP_DECODER_PROFILE_VC1_ADVANCED
);
default:
return
AVERROR
(
EINVAL
);
}
default:
return
AVERROR
(
EINVAL
);
}
#undef PROFILE
}
#endif
static
int
Open
(
vlc_va_t
*
va
,
AVCodecContext
*
ctx
,
const
es_format_t
*
fmt
)
{
VdpStatus
err
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment