Browse Source

avformat/nut: add ff_nut_audio_extra_tags to demuxer too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 12 years ago
parent
commit
968516cebf
3 changed files with 4 additions and 2 deletions
  1. +2
    -2
      libavformat/nut.c
  2. +1
    -0
      libavformat/nut.h
  3. +1
    -0
      libavformat/nutdec.c

+ 2
- 2
libavformat/nut.c View File

@@ -176,7 +176,7 @@ const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_NONE, 0 }
};

static const AVCodecTag nut_audio_extra_tags[] = {
const AVCodecTag ff_nut_audio_extra_tags[] = {
{ AV_CODEC_ID_PCM_ALAW, MKTAG('A', 'L', 'A', 'W') },
{ AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') },
{ AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
@@ -212,7 +212,7 @@ const AVCodecTag ff_nut_audio_tags[] = {

const AVCodecTag * const ff_nut_codec_tags[] = {
ff_nut_video_tags, ff_nut_audio_tags, ff_nut_subtitle_tags,
ff_codec_bmp_tags, ff_codec_wav_tags, nut_audio_extra_tags, ff_nut_data_tags, 0
ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_audio_extra_tags, ff_nut_data_tags, 0
};

void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val)


+ 1
- 0
libavformat/nut.h View File

@@ -112,6 +112,7 @@ typedef struct NUTContext {
extern const AVCodecTag ff_nut_subtitle_tags[];
extern const AVCodecTag ff_nut_video_tags[];
extern const AVCodecTag ff_nut_audio_tags[];
extern const AVCodecTag ff_nut_audio_extra_tags[];
extern const AVCodecTag ff_nut_data_tags[];

extern const AVCodecTag * const ff_nut_codec_tags[];


+ 1
- 0
libavformat/nutdec.c View File

@@ -390,6 +390,7 @@ static int decode_stream_header(NUTContext *nut)
st->codec->codec_id = av_codec_get_id((const AVCodecTag * const []) {
ff_nut_audio_tags,
ff_codec_wav_tags,
ff_nut_audio_extra_tags,
0
},
tmp);


Loading…
Cancel
Save