diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-11 01:22:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-11 01:22:22 +0100 |
| commit | a78f6b8cb98611a846a68f4bbb77e78fd5c175bf (patch) | |
| tree | 45d4339cefc60f61310bd23b8d7cf7d0bf1f88b6 /tests | |
| parent | 394d41ee30b0c4a38a8d33b65e28facfef15d465 (diff) | |
| parent | f98ede7e610da644d3e5d553fc5d7102cf1ccde7 (diff) | |
| download | ffmpeg-streaming-a78f6b8cb98611a846a68f4bbb77e78fd5c175bf.zip ffmpeg-streaming-a78f6b8cb98611a846a68f4bbb77e78fd5c175bf.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (38 commits)
v210enc: remove redundant check for pix_fmt
wavpack: allow user to disable CRC checking
v210enc: Use Bytestream2 functions
cafdec: Check return value of avio_seek and avoid modifying state if it fails
yop: Check return value of avio_seek and avoid modifying state if it fails
tta: Check return value of avio_seek and avoid modifying state if it fails
tmv: Check return value of avio_seek and avoid modifying state if it fails
r3d: Check return value of avio_seek and avoid modifying state if it fails
nsvdec: Check return value of avio_seek and avoid modifying state if it fails
mpc8: Check return value of avio_seek and avoid modifying state if it fails
jvdec: Check return value of avio_seek and avoid modifying state if it fails
filmstripdec: Check return value of avio_seek and avoid modifying state if it fails
ffmdec: Check return value of avio_seek and avoid modifying state if it fails
dv: Check return value of avio_seek and avoid modifying state if it fails
bink: Check return value of avio_seek and avoid modifying state if it fails
Check AVCodec.pix_fmts in avcodec_open2()
svq3: Prevent illegal reads while parsing extradata.
remove ParseContext1
vc1: use ff_parse_close
mpegvideo parser: move specific fields into private context
...
Conflicts:
libavcodec/4xm.c
libavcodec/aacdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/mpeg4video_parser.c
libavcodec/svq3.c
libavcodec/v210enc.c
libavformat/cafdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/aac.mak | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index ea87436..0d4aa4a 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -8,15 +8,15 @@ fate-aac-al05_44: REF = $(SAMPLES)/aac/al05_44.s16 FATE_AAC += fate-aac-al06_44 fate-aac-al06_44: CMD = pcm -i $(SAMPLES)/aac/al06_44.mp4 -fate-aac-al06_44: REF = $(SAMPLES)/aac/al06_44.s16 +fate-aac-al06_44: REF = $(SAMPLES)/aac/al06_44_reorder.s16 FATE_AAC += fate-aac-al07_96 fate-aac-al07_96: CMD = pcm -i $(SAMPLES)/aac/al07_96.mp4 -fate-aac-al07_96: REF = $(SAMPLES)/aac/al07_96.s16 +fate-aac-al07_96: REF = $(SAMPLES)/aac/al07_96_reorder.s16 FATE_AAC += fate-aac-al15_44 fate-aac-al15_44: CMD = pcm -i $(SAMPLES)/aac/al15_44.mp4 -fate-aac-al15_44: REF = $(SAMPLES)/aac/al15_44.s16 +fate-aac-al15_44: REF = $(SAMPLES)/aac/al15_44_reorder.s16 FATE_AAC += fate-aac-al17_44 fate-aac-al17_44: CMD = pcm -i $(SAMPLES)/aac/al17_44.mp4 @@ -32,7 +32,7 @@ fate-aac-am00_88: REF = $(SAMPLES)/aac/am00_88.s16 FATE_AAC += fate-aac-am05_44 fate-aac-am05_44: CMD = pcm -i $(SAMPLES)/aac/am05_44.mp4 -fate-aac-am05_44: REF = $(SAMPLES)/aac/am05_44.s16 +fate-aac-am05_44: REF = $(SAMPLES)/aac/am05_44_reorder.s16 FATE_AAC += fate-aac-al_sbr_hq_cm_48_2 fate-aac-al_sbr_hq_cm_48_2: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_2.mp4 @@ -40,7 +40,7 @@ fate-aac-al_sbr_hq_cm_48_2: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_2.s16 FATE_AAC += fate-aac-al_sbr_hq_cm_48_5.1 fate-aac-al_sbr_hq_cm_48_5.1: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_5.1.mp4 -fate-aac-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1.s16 +fate-aac-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1_reorder.s16 FATE_AAC += fate-aac-al_sbr_ps_06_ur fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(SAMPLES)/aac/al_sbr_ps_06_new.mp4 |
