OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21c2e20
)
dv: Correctly identify CDVC profile
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 27 Feb 2013 16:19:51 +0000
(17:19 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 27 Feb 2013 16:19:51 +0000
(17:19 +0100)
Fixes Ticket2177
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dv_profile.c
patch
|
blob
|
history
diff --git
a/libavcodec/dv_profile.c
b/libavcodec/dv_profile.c
index
05d4aba
..
a1d9881
100644
(file)
--- a/
libavcodec/dv_profile.c
+++ b/
libavcodec/dv_profile.c
@@
-298,7
+298,11
@@
const DVprofile* avpriv_dv_frame_profile2(AVCodecContext* codec, const DVprofile
return &dv_profiles[2];
}
- if(stype == 0 && codec && codec->codec_tag==AV_RL32("dvsd") && codec->coded_width==720 && codec->coded_height==576)
+ if( stype == 0
+ && codec
+ && (codec->codec_tag==AV_RL32("dvsd") || codec->codec_tag==AV_RL32("CDVC"))
+ && codec->coded_width ==720
+ && codec->coded_height==576)
return &dv_profiles[1];
for (i = 0; i < FF_ARRAY_ELEMS(dv_profiles); i++)