diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:42:49 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-05 00:42:49 +0000 |
| commit | cc8be506379ae89eeac987b1f612fcd7f946babb (patch) | |
| tree | b90a1ae71e5a934c7b9b86527632f146fe8ac8f0 /libavformat/matroskadec.c | |
| parent | 20fb02c5b93625764990f89fbea1a3793965e00c (diff) | |
| download | ffmpeg-cc8be506379ae89eeac987b1f612fcd7f946babb.tar.gz | |
matroska: expand useless define for MS compat codec id strings
Originally committed as revision 14607 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8e8dfc7d58..d90162b404 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1138,12 +1138,12 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) if (st == NULL) return AVERROR(ENOMEM); - if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_VIDEO_VFW_FOURCC) + if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && track->codec_priv.size >= 40 && track->codec_priv.data != NULL) { track->video.fourcc = AV_RL32(track->codec_priv.data + 16); codec_id = codec_get_id(codec_bmp_tags, track->video.fourcc); - } else if (!strcmp(track->codec_id, MATROSKA_CODEC_ID_AUDIO_ACM) + } else if (!strcmp(track->codec_id, "A_MS/ACM") && track->codec_priv.size >= 18 && track->codec_priv.data != NULL) { uint16_t tag = AV_RL16(track->codec_priv.data); |