[FFmpeg-cvslog] r22007 - trunk/ffplay.c

[David Conrad]

On Mar 4, 2010, at 6:40 PM, Michael Niedermayer wrote:

> On Thu, Mar 04, 2010 at 06:12:22PM -0500, David Conrad wrote:
>> On Mar 4, 2010, at 6:04 PM, David Conrad wrote:
>> 
>>> On Feb 23, 2010, at 12:09 PM, michael wrote:
>>> 
>>>> Author: michael
>>>> Date: Tue Feb 23 18:09:53 2010
>>>> New Revision: 22007
>>>> 
>>>> Log:
>>>> Dont modify wanted_stream.
>>>> 
>>>> Modified:
>>>> trunk/ffplay.c
>>>> 
>>>> Modified: trunk/ffplay.c
>>>> ==============================================================================
>>>> --- trunk/ffplay.c	Tue Feb 23 17:56:23 2010	(r22006)
>>>> +++ trunk/ffplay.c	Tue Feb 23 18:09:53 2010	(r22007)
>>>> @@ -1980,6 +1980,7 @@ static int decode_thread(void *arg)
>>>>   AVFormatContext *ic;
>>>>   int err, i, ret;
>>>>   int st_index[CODEC_TYPE_NB];
>>>> +    int st_count[CODEC_TYPE_NB]={0};
>>>>   AVPacket pkt1, *pkt = &pkt1;
>>>>   AVFormatParameters params, *ap = ¶ms;
>>>>   int eof=0;
>>>> @@ -2045,18 +2046,20 @@ static int decode_thread(void *arg)
>>>>   for(i = 0; i < ic->nb_streams; i++) {
>>>>       AVCodecContext *avctx = ic->streams[i]->codec;
>>>>       ic->streams[i]->discard = AVDISCARD_ALL;
>>>> +        if(avctx->codec_type >= (unsigned)CODEC_TYPE_NB)
>>>> +            exit(1);
>>> 
>>> Why error out if the codec_type is unknown? (this broke ogg with any unhandled tracks since we don't know codec_type unless we can handle the track)
> 
> because i did not remember we had a -1 CodecType
> 
> 
>> 
>> And a patch:
> 
> ok

Applied