vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue Jul 31 08:15:25 2018 +0200| [5bc3abd7535774c35d5ce18183151104f982cb4c] | committer: Steve Lhomme
directx_va: DXVA2_ModeMPEG2_VLD also supports the main profile Ref #20343 (cherry picked from commit d170d0d79db04a97d0739564421f48752480d93e) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5bc3abd7535774c35d5ce18183151104f982cb4c --- modules/codec/avcodec/directx_va.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c index 9de31587e3..e12704729b 100644 --- a/modules/codec/avcodec/directx_va.c +++ b/modules/codec/avcodec/directx_va.c @@ -48,7 +48,6 @@ struct picture_sys_t { #include "../../packetizer/h264_nal.h" #include "../../packetizer/hevc_nal.h" -static const int PROF_MPEG2_SIMPLE[] = { FF_PROFILE_MPEG2_SIMPLE, 0 }; static const int PROF_MPEG2_MAIN[] = { FF_PROFILE_MPEG2_SIMPLE, FF_PROFILE_MPEG2_MAIN, 0 }; static const int PROF_H264_HIGH[] = { FF_PROFILE_H264_BASELINE, @@ -176,7 +175,7 @@ static const directx_va_mode_t DXVA_MODES[] = { { "MPEG-2 decoder, restricted profile C", &DXVA_ModeMPEG2_C, 0, NULL }, { "MPEG-2 decoder, restricted profile D", &DXVA_ModeMPEG2_D, 0, NULL }, - { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_SIMPLE }, + { "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN }, { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN }, { "MPEG-2 & MPEG-1 variable-length decoder", &DXVA2_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG1VIDEO, NULL }, { "MPEG-2 motion compensation", &DXVA2_ModeMPEG2_MoComp, 0, NULL }, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
