[vlc-commits] [Git][videolan/vlc][master] codec: avcodec: don't overwrite fmt_in profile/level

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b4fc9059 by Francois Cartegnie at 2022-11-12T08:38:47+00:00
codec: avcodec: don't overwrite fmt_in profile/level

Neverending restart regression after 53f6ee83fbd1c34bde38677a12555d8e667faa76

Introduced by 6559a56bd9da9e6c7f88e6d99cdd9c5e2a795340 for vdpau

Profile/level is never read outside of directx_va with fallback on
context

EVO/mpeg+vc1+ac3++quazgaas_problem.evo

- - - - -


2 changed files:

- modules/codec/avcodec/audio.c
- modules/codec/avcodec/video.c


Changes:

=====================================
modules/codec/avcodec/audio.c
=====================================
@@ -264,12 +264,6 @@ int InitAudioDec( vlc_object_t *obj )
     p_dec->pf_decode = DecodeAudio;
     p_dec->pf_flush  = Flush;
 
-    /* XXX: Writing input format makes little sense. */
-    if( avctx->profile != FF_PROFILE_UNKNOWN )
-        p_dec->fmt_in.i_profile = avctx->profile;
-    if( avctx->level != FF_LEVEL_UNKNOWN )
-        p_dec->fmt_in.i_level = avctx->level;
-
     return VLC_SUCCESS;
 }
 


=====================================
modules/codec/avcodec/video.c
=====================================
@@ -601,11 +601,6 @@ int InitVideoDec( vlc_object_t *obj )
     p_dec->pf_decode = DecodeVideo;
     p_dec->pf_flush  = Flush;
 
-    /* XXX: Writing input format makes little sense. */
-    if( p_context->profile != FF_PROFILE_UNKNOWN )
-        p_dec->fmt_in.i_profile = p_context->profile;
-    if( p_context->level != FF_LEVEL_UNKNOWN )
-        p_dec->fmt_in.i_level = p_context->level;
     return VLC_SUCCESS;
 }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b4fc9059ddbe673831df5d973a8827976bf42227

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b4fc9059ddbe673831df5d973a8827976bf42227
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance