virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/nut: add ff_nut_audio_extra_tags to demuxer too

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-09 23:37:55 +02:00
parent f703dae7aa
commit 968516cebf
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/nut.c
View File

@ -176,7 +176,7 @@ const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_NONE, 0 } { 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_ALAW, MKTAG('A', 'L', 'A', 'W') },
{ AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') }, { AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') },
{ AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, { 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[] = { const AVCodecTag * const ff_nut_codec_tags[] = {
ff_nut_video_tags, ff_nut_audio_tags, ff_nut_subtitle_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) void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val)

1
libavformat/nut.h
View File

@ -112,6 +112,7 @@ typedef struct NUTContext {
extern const AVCodecTag ff_nut_subtitle_tags[]; extern const AVCodecTag ff_nut_subtitle_tags[];
extern const AVCodecTag ff_nut_video_tags[]; extern const AVCodecTag ff_nut_video_tags[];
extern const AVCodecTag ff_nut_audio_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 ff_nut_data_tags[];
extern const AVCodecTag * const ff_nut_codec_tags[]; extern const AVCodecTag * const ff_nut_codec_tags[];

1
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 []) { st->codec->codec_id = av_codec_get_id((const AVCodecTag * const []) {
ff_nut_audio_tags, ff_nut_audio_tags,
ff_codec_wav_tags, ff_codec_wav_tags,
ff_nut_audio_extra_tags,
0 0
}, },
tmp); tmp);