[FFmpeg-cvslog] vdpau_mpeg4: Do not fail on unknown profile.

Reimar Döffinger git at videolan.org
Wed Nov 5 20:07:57 CET 2014


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sat Nov  1 13:44:21 2014 +0100| [a26d0ffa18dbbd29555a971130307adf397e0e29] | committer: Reimar Döffinger

vdpau_mpeg4: Do not fail on unknown profile.

This is a regression, previous code did not require
users to set the profile to use VDPAU.
In addition, ASP is a superset of SP, so there is not
even a good reason to require it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a26d0ffa18dbbd29555a971130307adf397e0e29
---

 libavcodec/vdpau_mpeg4.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c
index 2a036b6..9141bec 100644
--- a/libavcodec/vdpau_mpeg4.c
+++ b/libavcodec/vdpau_mpeg4.c
@@ -119,6 +119,9 @@ static int vdpau_mpeg4_init(AVCodecContext *avctx)
     case FF_PROFILE_MPEG4_SIMPLE:
         profile = VDP_DECODER_PROFILE_MPEG4_PART2_SP;
         break;
+    // As any ASP decoder must be able to decode SP, this
+    // should be a safe fallback if profile is unknown/unspecified.
+    case FF_PROFILE_UNKNOWN:
     case FF_PROFILE_MPEG4_ADVANCED_SIMPLE:
         profile = VDP_DECODER_PROFILE_MPEG4_PART2_ASP;
         break;



More information about the ffmpeg-cvslog mailing list