[vlc-devel] [PATCH 7/8] avcodec: video: move the profile/level setting closer to where it's tested

[Steve Lhomme]

---
 modules/codec/avcodec/video.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 773d9cb664..ef2045c39b 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1481,6 +1481,9 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
             }
     }
 
+    p_sys->profile = p_context->profile;
+    p_sys->level = p_context->level;
+
     if (p_sys->p_va != NULL)
     {
         msg_Err(p_dec, "existing hardware acceleration cannot be reused");
@@ -1488,9 +1491,6 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
         p_sys->p_va = NULL;
     }
 
-    p_sys->profile = p_context->profile;
-    p_sys->level = p_context->level;
-
     if (!can_hwaccel)
         return swfmt;
 
-- 
2.12.1