History

avformat/wvdec: Export version as extradata

It might be used by the Matroska muxer. This is also the reason why the FATE-tests for muxing WavPack into Matroska needed to be updated: They now write the correct version 4.07 and not 4.03 as before.

Andreas Rheinhardt committed 6 years ago

Commit 96bf6d61 parent 048bc3f2 files · +5 −2Browse files

Unified · Split

2 files
  1. libavformat/wvdec.c +3 −0
  2. tests/fate/wavpack.mak +2 −2
libavformat/wvdec.c+3−0
@@ -250,6 +250,9 @@ static int wv_read_header(AVFormatContext *s) · 249 unmodified lines
250 st = avformat_new_stream(s, NULL);250 st = avformat_new_stream(s, NULL);
251 if (!st)251 if (!st)
252 return AVERROR(ENOMEM);252 return AVERROR(ENOMEM);
253 if ((ret = ff_alloc_extradata(st->codecpar, 2)) < 0)
254 return ret;
255 AV_WL16(st->codecpar->extradata, wc->header.version);
253 st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;256 st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
254 st->codecpar->codec_id = AV_CODEC_ID_WAVPACK;257 st->codecpar->codec_id = AV_CODEC_ID_WAVPACK;
255 st->codecpar->channels = wc->chan;258 st->codecpar->channels = wc->chan;
tests/fate/wavpack.mak+2−2
@@ -91,12 +91,12 @@ fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matros · 90 unmodified lines
91FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono91FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono
92fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska92fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska
93fate-wavpack-matroska_mux-mono: CMP = oneline93fate-wavpack-matroska_mux-mono: CMP = oneline
94fate-wavpack-matroska_mux-mono: REF = 0a1a7c6d3b413925f8261c92d1d5336394fate-wavpack-matroska_mux-mono: REF = a9da0444604848080b08e32de19f42d9
95 95
96FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-6196FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61
97fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska97fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska
98fate-wavpack-matroska_mux-61: CMP = oneline98fate-wavpack-matroska_mux-61: CMP = oneline
99fate-wavpack-matroska_mux-61: REF = 1f012f7c237f46f2f63089ba84c589c599fate-wavpack-matroska_mux-61: REF = 60812e377937456863a3c899ee068060
100 100
101FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes)101FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes)
102fate-wavpack: $(FATE_WAVPACK-yes)102fate-wavpack: $(FATE_WAVPACK-yes)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t