diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 12:04:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:01:30 +0200 |
| commit | 98298eb1034bddb4557fa689553dae793c2b0092 (patch) | |
| tree | d35dcd981b6647c9f538bc9b346ab806864bc359 /tests/ref/fate/g723_1-dec-7 | |
| parent | f3683349aecf3be4c9c875186a812c0cde8ecf41 (diff) | |
| parent | ec36aa69448f20a78d8c4588265022e0b2272ab5 (diff) | |
| download | ffmpeg-98298eb1034bddb4557fa689553dae793c2b0092.tar.gz | |
Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'
* commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5':
x86: Fix linking with some or all of yasm, mmx, optimizations disabled
configure: Add more fine-grained SSE CPU capabilities flags
avfilter: x86: Use more precise compile template names
x86: cosmetics: Comment some #endifs for better readability
g723_1: add comfort noise generation
utvideoenc: Switch to dsputils' median prediction
utvideoenc: Avoid writing into the input picture
avtools: remove the distinction between func_arg and func2_arg.
avconv: make the -passlogfile option per-stream.
avconv: make the -pass option per-stream.
cmdutils: make -codecs print lossy/lossless flags.
lavc: add lossy/lossless codec properties.
Conflicts:
Changelog
cmdutils.c
configure
doc/APIchanges
ffmpeg.h
ffmpeg_opt.c
ffprobe.c
libavcodec/codec_desc.c
libavcodec/g723_1.c
libavcodec/utvideoenc.c
libavcodec/version.h
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/rv40dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/g723_1-dec-7')
| -rw-r--r-- | tests/ref/fate/g723_1-dec-7 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/ref/fate/g723_1-dec-7 b/tests/ref/fate/g723_1-dec-7 new file mode 100644 index 0000000000..cc301873cb --- /dev/null +++ b/tests/ref/fate/g723_1-dec-7 @@ -0,0 +1,12 @@ +#tb 0: 1/8000 +0, 0, 0, 240, 480, 0x35e4a1fd +0, 240, 240, 240, 480, 0x2f7bdd60 +0, 480, 480, 240, 480, 0x0407e499 +0, 720, 720, 240, 480, 0x5f5ef209 +0, 960, 960, 240, 480, 0xe936e8d1 +0, 1200, 1200, 240, 480, 0x0896ddba +0, 1440, 1440, 240, 480, 0xa885ea94 +0, 1680, 1680, 240, 480, 0x40bff3d0 +0, 1920, 1920, 240, 480, 0xe05ce4c3 +0, 2160, 2160, 240, 480, 0x80c4f790 +0, 2400, 2400, 240, 480, 0x65d5e8f9 |