| Message ID | 201703010940.08541.cehoyos@ag.or.at |
|---|---|
| State | Rejected |
| Headers | show |
On Wed, Mar 01, 2017 at 09:40:08AM +0100, Carl Eugen Hoyos wrote: > Hi! > > Attached patch fixes ticket #6208. > > Please comment, Carl Eugen breaks tickets/3400/akiyo_cif.avs [...]
2017-03-01 19:01 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: > On Wed, Mar 01, 2017 at 09:40:08AM +0100, Carl Eugen Hoyos wrote: >> Hi! >> >> Attached patch fixes ticket #6208. >> >> Please comment, Carl Eugen > > breaks tickets/3400/akiyo_cif.avs I feared so. Not sure I can fix this, Carl Eugen
diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index b4da58e..fa920ad 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -61,8 +61,11 @@ static int cavsvideo_probe(AVProbeData *p) } } } - if(seq && seq*9<=pic*10) + if (seq && seq * 9 <= pic * 10 && pic > 1) { return AVPROBE_SCORE_EXTENSION+1; + } else if (seq && seq * 9 <= pic * 10) { + return AVPROBE_SCORE_EXTENSION - 1; + } return 0; }
Hi! Attached patch fixes ticket #6208. Please comment, Carl Eugen From 901443bd61d33f62a4fd904aad5f270d0a018a8a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos <cehoyos@ag.or.at> Date: Wed, 1 Mar 2017 09:35:16 +0100 Subject: [PATCH 2/2] lavf/cavsvideodec: Return a lower score if only one frame was found. Fixes ticket #6208. --- libavformat/cavsvideodec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)