RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
48,325 Commits 36 Branches 392 Tags 305 MiB
Commit Graph

506 Commits

Author SHA1 Message Date
Clément Bœsch 725d6c615c Add MPlayer subtitles demuxer. 2012-12-30 23:09:49 +01:00
Clément Bœsch 5c68aae908 Add VPlayer subtitles demuxer and decoder. 
Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.
 2012-12-30 22:46:42 +01:00
Clément Bœsch 5f02844c8d Add MPL2 subtitles demuxer and decoder. 2012-12-30 22:37:25 +01:00
Clément Bœsch e5e5664ca0 fate: add and fix subtitles dependencies. 2012-12-20 03:50:34 +01:00
Clément Bœsch ca83e6ce26 fate: re-enable lavfi gradfun filter test. 2012-12-19 03:13:26 +01:00
Michael Niedermayer 94ecbe23c5 Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a' 
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
  au: Reorder code so that both muxer and demuxer are under #ifdefs
  fate: Move RALF test into lossless audio group
  cosmetics: Use consistent names for multiple inclusion guards.

Conflicts:
	libavformat/au.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-18 14:27:59 +01:00
Diego Biurrun 4d6c96fd69 fate: Move RALF test into lossless audio group 2012-12-17 17:02:22 +01:00
Michael Niedermayer e095c4ea6d fate: update asyncts reference 
We cannot update the existing file because this would break
ffmpeg 1.0, which uses it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 19:02:39 +01:00
Paul B Mahol 2375139007 fate: add BRSTM demuxer test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-11 11:34:47 +00:00
Michael Niedermayer af164d7d9f Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152' 
* commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152':
  fate: dpcm: Add dependencies
  SBR DSP x86: implement SSE sbr_hf_gen
  AAC SBR: use AVFloatDSPContext's vector_fmul
  fate: image: Add dependencies
  Changelog: add an entry for deprecating the avconv -vol option
  x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32

Conflicts:
	Changelog
	libavutil/x86/float_dsp.asm
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-07 15:21:41 +01:00
Diego Biurrun c25fc5c2bb fate: dpcm: Add dependencies 2012-12-07 11:34:16 +01:00
Diego Biurrun 33086f9265 fate: image: Add dependencies 2012-12-07 10:14:31 +01:00
Clément Bœsch a0b2e8e155 lavfi/silencedetect: use eval builtin to parse dB. 
Also update FATE test to use the dB form.
 2012-12-06 15:08:38 +01:00
Clément Bœsch d3451a9c0f fate/hqdn3d: add -idct simple. 
This should fix FATE failure on ARM. IDCT is required since it's a JPEG
source.
 2012-12-05 23:36:31 +01:00
Paul B Mahol 880191637f IRCAM demuxer & muxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-05 13:01:22 +00:00
Michael Niedermayer 99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 13:34:45 +01:00
Michael Niedermayer 1fa2bdc90a fate: disable vf_gradfun test 
The non working test interferes with other peoples work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-05 13:10:24 +01:00
Clément Bœsch b5ffbcd0cd fate: add gradfun filter test. 2012-12-05 00:01:17 +01:00
Clément Bœsch ab981cab93 fate: add hqdn3d filter test. 2012-12-05 00:01:17 +01:00
Diego Biurrun 90153465b0 fate: Add dependencies for bmp, cdxl, dfa, mp3 2012-12-04 15:24:05 +01:00
Michael Niedermayer dacd6202ec Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: always use pic for shared libraries
  build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
  fate: ea, h264: prettyprinting and ordering cosmetics

Conflicts:
	tests/fate/ea.mak
	tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-04 14:23:22 +01:00
James Almer b70251c0ad AST Muxer 
Signed-off-by: James Almer <jamrial@gmail.com>
 2012-12-04 11:25:46 +00:00
Diego Biurrun 201628899b fate: ea, h264: prettyprinting and ordering cosmetics 2012-12-03 15:34:37 +01:00
Michael Niedermayer 5e2be27e65 fate: fix typos in wtv seek test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 03:15:41 +01:00
Michael Niedermayer b452c8a722 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: fft: Fix libavcodec dependency
  build: Make the ISMV muxer select the MOV muxer
  configure: move arm arch extensions to a separate variable

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 02:59:19 +01:00
Michael Niedermayer 7711f19eda Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6' 
* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
  fate-seek: remove use of gnu make 3.82 only private modifier
  fate: move vsynth reference files to their own directory
  fate: move fate-acodec reference files to their own dir
  configure: avplay now depends on avresample
  fate: split dependencies for fate-seek tests

Conflicts:
	configure
	tests/fate/seek.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-03 02:33:27 +01:00
Diego Biurrun eebc40e177 fate: fft: Fix libavcodec dependency 2012-12-03 01:34:14 +01:00
Janne Grunau e816034a5f fate-seek: remove use of gnu make 3.82 only private modifier 2012-12-03 00:37:07 +01:00
Janne Grunau c8148e5c93 fate: move vsynth reference files to their own directory 2012-12-03 00:36:10 +01:00
Janne Grunau 337dbe2adb fate: move fate-acodec reference files to their own dir 2012-12-03 00:29:35 +01:00
Janne Grunau abab0435d4 fate: split dependencies for fate-seek tests 
Each fate-seek test depends now only on the corresponding fate-acodec,
fate-vsynth2 or fate-lavf test which creates the file seek-tests
operates on. The tests and references are renamed to match the test they
depend on.
 2012-12-02 23:25:41 +01:00
Clément Bœsch 72e84a08e6 fate: add hue filter test. 2012-12-02 14:44:26 +01:00
Michael Niedermayer b5cedf8b66 fate/mp3: increase fuzz for NEON, due to different rounding from lrintf() 
This should fix fate failures of the hecommon test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-01 17:15:57 +01:00
Paul B Mahol a9236b87b7 fate: add tak dependencies 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-29 13:24:48 +00:00
Paul B Mahol 26f1b1a0fa fate: add ADPCM 4XM test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-29 13:24:48 +00:00
Michael Niedermayer 9f8e2e92ae Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' 
* commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd':
  fate: h264: Add dependencies
  fate: ea: Add dependencies
  fate: Do not unconditionally run libavutil tests
  rtpenc_chain: Remove unused variable
  nuv: check for malloc failure when allocating extradata
  nuv: use the stream indices generated by avformat_new_stream()

Conflicts:
	tests/fate/ea.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 14:16:46 +01:00
Michael Niedermayer 076300bf8b Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 13:45:57 +01:00
Michael Niedermayer 7dc0ed80e8 Merge commit '1f3f896564501c23b44fcf605567c78ce066b539' 
* commit '1f3f896564501c23b44fcf605567c78ce066b539':
  fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
  fate: real: Add dependencies
  fate: lossless-audio: Add dependencies
  x86: h264dsp: Fix linking with yasm and optimizations disabled

Conflicts:
	libavcodec/x86/h264dsp_init.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 13:35:56 +01:00
Diego Biurrun e4d349b401 fate: h264: Add dependencies 2012-11-28 19:58:21 +01:00
Diego Biurrun d2f576bd49 fate: ea: Add dependencies 2012-11-28 19:36:13 +01:00
Diego Biurrun 47e7fb8815 fate: Do not unconditionally run libavutil tests 
Now that libavutil can be disabled, this should be conditional.
 2012-11-28 19:36:13 +01:00
Diego Biurrun db9dbfb72a fate: vpx: Add dependencies 2012-11-28 16:19:55 +01:00
Diego Biurrun a1d1fc9b4a fate: Fix wavpack-matroskamode test dependencies 2012-11-28 16:05:44 +01:00
Diego Biurrun 1f3f896564 fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests 2012-11-28 14:45:28 +01:00
Diego Biurrun 5116ac7774 fate: real: Add dependencies 2012-11-28 14:45:28 +01:00
Diego Biurrun 9534e0f552 fate: lossless-audio: Add dependencies 2012-11-28 14:45:28 +01:00
Paul B Mahol 761aba6811 fate: add ADPCM IMA Dialogic OKI decoder test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-27 19:07:18 +00:00
Paul B Mahol a8ebbf87be fate: add ADPCM AFC decoder test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-23 17:30:05 +00:00
Paul B Mahol 6f9ca8cbe0 fate: add AST demuxer test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-23 17:30:05 +00:00
Paul B Mahol 50a9530bc4 fate: increase pcm coverage 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-20 19:29:00 +00:00