diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2014-11-01 13:44:21 +0100 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2014-11-05 20:07:31 +0100 |
| commit | a26d0ffa18dbbd29555a971130307adf397e0e29 (patch) | |
| tree | 72da2f885f8353aabe54ea95e6c22ea03f6953d4 | |
| parent | 4fd70679877b71fd624b02bc35b145065591e638 (diff) | |
| download | ffmpeg-a26d0ffa18dbbd29555a971130307adf397e0e29.tar.gz | |
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@gmx.de>
| -rw-r--r-- | libavcodec/vdpau_mpeg4.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 2a036b61dd..9141becd9f 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; |