[SCM] libav/experimental: Ensure codec_id = CODEC_ID_NONE for unknown codecs (don't reuse previous one). Patch by Steve Lhomme % slhomme A divxcorp P com % Original thread: Date: Mon, 06 Nov 2006 21:20:14 +0100 Subject: [Ffmpeg-devel] [PATCH] Matroska known/unknown codec

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 063c8f266253114ed2dfc6ec62e15a01c5799db5
Author: Steve L'Homme <slhomme at divxcorp.com>
Date:   Mon Nov 6 23:14:37 2006 +0000

    Ensure codec_id = CODEC_ID_NONE for unknown codecs (don't reuse previous one).
    Patch by Steve Lhomme % slhomme A divxcorp P com %
    Original thread:
    Date: Mon, 06 Nov 2006 21:20:14 +0100
    Subject: [Ffmpeg-devel] [PATCH] Matroska known/unknown codec
    
    Originally committed as revision 6923 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 1cca292..bab2990 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -2138,11 +2138,11 @@ matroska_read_header (AVFormatContext    *s,
     /* Have we found a cluster? */
     if (res == 1) {
         int i, j;
-        enum CodecID codec_id= CODEC_ID_NONE;
         MatroskaTrack *track;
         AVStream *st;
 
         for (i = 0; i < matroska->num_tracks; i++) {
+            enum CodecID codec_id = CODEC_ID_NONE;
             void *extradata = NULL;
             int extradata_size = 0;
             track = matroska->tracks[i];

-- 
Libav/FFmpeg packaging