diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 14:31:19 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 14:56:52 +0100 |
| commit | 166f2c52ace4d969482bcf56e7f0f06942eaf71d (patch) | |
| tree | ff1208224f3d3a0c05a3d89c6129f6fc1a0c24fa /tests/fate/aac.mak | |
| parent | 06136275e59c38806b04a1fc9cc92beb82db79b6 (diff) | |
| parent | b55566db4c51d920a6496455bb30a608e5a50a41 (diff) | |
| download | ffmpeg-streaming-166f2c52ace4d969482bcf56e7f0f06942eaf71d.zip ffmpeg-streaming-166f2c52ace4d969482bcf56e7f0f06942eaf71d.tar.gz | |
Merge commit 'b55566db4c51d920a6496455bb30a608e5a50a41'
* commit 'b55566db4c51d920a6496455bb30a608e5a50a41':
avconv: use avcodec_parameters_copy() with streamcopy
The fate-aac-autobsf-adtstoasc changes from writing an audio bitdepth
based on the sample format, which is now available.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'tests/fate/aac.mak')
| -rw-r--r-- | tests/fate/aac.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 9ce8efb..2af66c2 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -243,7 +243,7 @@ fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 fate-aac-autobsf-adtstoasc: CMD = md5 -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts -acodec copy -fflags +bitexact -f matroska fate-aac-autobsf-adtstoasc: CMP = oneline -fate-aac-autobsf-adtstoasc: REF = 8c6fbebb64ebbe9e01b345d77844d7cd +fate-aac-autobsf-adtstoasc: REF = 8c76732bd04d9eb3468f9f842439774d FATE_AAC-$(call DEMDEC, AAC, AAC) += $(FATE_AAC_CT_RAW) FATE_AAC-$(call DEMDEC, MOV, AAC) += $(FATE_AAC) |
