[FFmpeg-devel] [PATCH] Fixed EA vp6 files with alpha not picked up by the EA demuxer

[Stephan Vedder]

I attached the fixed patch now.

2015-06-22 20:43 GMT+02:00 Stephan Vedder <stephan.vedder at gmail.com>:

> I just noticed that i got a wrong patch file attached. Let me make a new
> diff.
> I didn't mean a real crash, i just meant an error output that this file
> isn't playable
>
> 2015-06-22 20:13 GMT+02:00 Michael Niedermayer <michaelni at gmx.at>:
>
>> On Mon, Jun 22, 2015 at 02:41:07PM +0000, Carl Eugen Hoyos wrote:
>> >  <stephan.vedder <at> gmail.com> writes:
>> >
>> > >
>> >
>> https://bfme2-see.googlecode.com/svn-history/r129/trunk/data/movies/SmallRing.vp6
>> >
>> > > Before you had to use: ffplay -f ./SmallRing.vp6
>> > > since it would use the aac demuxer otherwise
>> > > (resulting in a crash).
>> >
>> > How can I reproduce the crash?
>> > Crashes are always (very) important, but
>> > I cannot reproduce...
>>
>> i see no crash either also no anomaly under valgrind
>>
>> [...]
>> --
>> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>>
>> Many things microsoft did are stupid, but not doing something just because
>> microsoft did it is even more stupid. If everything ms did were stupid
>> they
>> would be bankrupt already.
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel at ffmpeg.org
>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>>
>
-------------- next part --------------
commit b1646ba4cbce2d285f7f268ec49ed0362e5fdf55
Author: Stephan Vedder <stephan.vedder at gmail.com>
Date:   Mon Jun 22 20:56:23 2015 +0200

    Fixed ea_probe function to accept vp6a videos

diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index d6a396b..d999a0b 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -61,6 +61,7 @@
 #define MV0F_TAG MKTAG('M', 'V', '0', 'F')
 #define MVIh_TAG MKTAG('M', 'V', 'I', 'h')  /* CMV header */
 #define MVIf_TAG MKTAG('M', 'V', 'I', 'f')  /* CMV I-frame */
+#define AVP6_TAG MKTAG('A', 'V', 'P', '6')
 
 typedef struct EaDemuxContext {
     int big_endian;
@@ -458,6 +459,7 @@ static int ea_probe(AVProbeData *p)
     case MPCh_TAG:
     case MVhd_TAG:
     case MVIh_TAG:
+    case AVP6_TAG:
         break;
     default:
         return 0;