Commit Graph

644 Commits

Author SHA1 Message Date
Mans Rullgard
371584c42b build: add -L flags before existing LDFLAGS
This ensures the linker picks the just built libraries even
if LDFLAGS for some reason contains -L flags pointing at
other directories containing libav libraries.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 12:50:31 +01:00
Michael Niedermayer
e10979ff56 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac7]
  hwaccel: unbreak build
  Eliminate FF_COMMON_FRAME macro.

Conflicts:
	Changelog
	Makefile
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-12 01:42:32 +02:00
Mans Rullgard
1fef92fd73 build: remove unnecessary dependency on libs from 'all' target
The libs are added to the all target elsewhere, no need to do it
again here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-11 21:08:52 +01:00
Mans Rullgard
ca9036155d build: remove unnecessary FFLDFLAGS variable
This variable is set to the same value for all directories.
Adding the -L flags directly to LDFLAGS is simpler and achieves
the same thing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-11 11:39:04 +01:00
Michael Niedermayer
3602ad7ee6 Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
  swscale: fix crash with dithering due incorrect offset calculation.
  matroskadec: fix stupid typo (!= -> ==)
  build: remove duplicates from order-only directory prerequisite list
  build: rework rules for things in the tools dir
  configure: fix --cpu=host with gcc 4.6
  ARM: use const macro to define constant data in asm
  bitdepth: simplify FUNC/FUNCC macros
  dsputil: remove ff_emulated_edge_mc macro used in one place
  9/10-bit: simplify clipping macros
  matroskadec: reindent
  matroskadec: defer parsing of cues element until we seek.
  lavc: add support for codec-specific defaults.
  lavc: make avcodec_alloc_context3 officially public.
  lavc: remove a half-working attempt at different defaults for audio/video codecs.
  ac3dec: add a drc_scale private option
  lavf: add avformat_find_stream_info()
  lavc: introduce avcodec_open2() as a replacement for avcodec_open().

Conflicts:
	Makefile
	libavcodec/utils.c
	libavformat/avformat.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-11 04:23:25 +02:00
Mans Rullgard
28e1c97916 build: rework rules for things in the tools dir
Declaring tools associated with each library in their respective
makefiles allows these tools to easily depend on the correct
prerequisites and link against the libs they need.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-10 21:13:38 +01:00
Michael Niedermayer
5d4fd1d1ad Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
  ARM: allow unaligned buffer in fixed-point NEON FFT4
  fate: test more FFT etc sizes
  dca: set AVCodecContext frame_size for DTS audio
  YASM: Shut up unused variable compiler warning with --disable-yasm.
  x86_32: Fix build on x86_32 with --disable-yasm.
  iirfilter: add fate test
  doxygen: Add qmul docs.
  ogg: propagate return values and return more meaningful error values
  H.264: fix overreads of qscale_table
  Remove unused static tables and static inline functions.
  eval: clear Parser instances before using
  dct-test: remove 'ref' function pointer from tables
  build: Remove deleted 'check' target from .PHONY list.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  mxfenc: small typo fix
  doxygen: Fix documentation for some VP8 functions.
  sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
  des: allow unaligned input and output buffers
  aes: allow unaligned input and output buffers
  ...

Conflicts:
	libavcodec/dct-test.c
	libavcodec/libvpxenc.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/h264_qpel_mmx.c
	libavfilter/x86/gradfun.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-05 02:26:17 +02:00
Diego Biurrun
db54be09c2 build: Remove deleted 'check' target from .PHONY list. 2011-07-04 13:14:31 +02:00
Michael Niedermayer
721be99371 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  cosmetics: fix some then/than typos
  doxygen: Include libavcodec and libavformat examples into the documentation
  avutil: elaborate documentation for av_get_random_seed
  Add support for aac streams in mp4/mov without extradata.
  aes: whitespace cosmetics
  adler32: whitespace cosmetics
  swscale: fix another yuv range conversion overflow in 16bit scaling.
  Fix cpu flags test program
  opt-test: Add missing braces to silence compiler warnings.
  build: Eliminate obsolete test targets.
  udp: Fix a compilation warning
  swscale: Unbreak build with --enable-small
  base64: add fate test
  aes: improve test program and add fate test
  adler32: make test program more useful and add fate test
  swscale: fix yuv range correction when using 16-bit scaling.
  aacenc: Make chan_map const correct

Conflicts:
	Makefile
	doc/examples/muxing-example.c
	libavformat/udp.c
	libavutil/random_seed.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-01 05:35:26 +02:00
Diego Biurrun
bd9a9a2f18 build: Eliminate obsolete test targets.
The targets are now part of FATE and can be run as individual FATE targets.
2011-06-30 13:06:27 +02:00
Michael Niedermayer
8c0cbb0848 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rational-test: Add proper main() declaration to fix gcc warnings.
  configure: Add vdpau and dxva2 to configure results output.
  Remove unused, never built libavutil/pca.[ch]
  matroskadec: forward parsing errors to caller.
  av_find_stream_info: simplify EAGAIN handling.
  aacenc: Fix determination of Mid/Side Mode.
  psymodel: Remove the single channel analysis function
  aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel.
  psymodel: Add channels and channel groups to the psymodel.
  ARM: remove check for PLD instruction
  fate: move amr[nw]b test rules into separate files
  ogg: fix double free when finding length of small chained oggs.
  swscale: implement >8bit scaling support.
  build: fix creation of tools dir with make 3.81
  build: Mark all-yes Makefile target as phony.
  pixfmt: fix YUV422/444 wrong endian comment
  build: create output directories as needed
  Add new yuv444 pixfmts to avcodec_align_dimensions2

Conflicts:
	Makefile
	configure
	libavutil/pca.c
	libavutil/pca.h
	libavutil/pixfmt.h
	libswscale/swscale.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-30 04:32:24 +02:00
Reimar Döffinger
e1a54304be Move SRC_PATH hack around to allow compilation from subdir again. 2011-06-30 00:02:09 +02:00
Mans Rullgard
f68069868b build: fix creation of tools dir with make 3.81
GNU make 3.81 apparently does not support order-only prerequisites
with pattern rules, and thus fails to create the tools directory
if it is missing.  Naming the objects explicitly in the rule makes
it work properly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 12:06:46 +01:00
Diego Biurrun
e2542dcc6e build: Mark all-yes Makefile target as phony. 2011-06-29 12:15:52 +02:00
Mans Rullgard
5e27ec28f0 build: create output directories as needed
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 09:14:56 +01:00
Michael Niedermayer
bb9d5171a7 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  swscale: Add Doxygen for hyscale_fast/hScale.
  fate: enable lavfi-pixmt tests on big endian systems
  PPC: swscale: disable altivec functions for unsupported formats
  fate: merge identical pixdesc_be/le tests
  swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
  build: call texi2pod.pl with full path instead of symlink
  build: include sub-makefiles using full path instead of symlinks
  swscale: update big endian reference values after dff5a835.
  wavpack: skip blocks with no samples
  cosmetics: remove outdated comment that is no longer true
  build: replace some addprefix/addsuffix with substitution refs
  avutil: Remove unused arbitrary precision integer code.
  configure: Drop check for availability of ten assembler operands.
  aacenc: Save channel configuration for later use.
  aacenc: Fix codebook trellising for zeroed bands.
  swscale: change prototypes of scaled YUV output functions.
  swscale: re-add support for non-native endianness.
  swscale: disentangle yuv2rgbX_c_full() into small functions.
  swscale: split yuv2packed[12X]_c() remainders into small functions.
  swscale: split yuv2packedX_altivec in smaller functions.
  ...

Conflicts:
	Makefile
	configure
	libavcodec/x86/dsputil_mmx.c
	libavfilter/Makefile
	libavformat/Makefile
	libavutil/integer.c
	libavutil/integer.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-29 05:23:12 +02:00
Mans Rullgard
57b4a3dd2b build: include sub-makefiles using full path instead of symlinks
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 18:15:19 +01:00
Mans Rullgard
bc877faf7f build: factor out the .c and .S compile commands as a macro
These commands have the same form, and using a common macro allows
it to be used elsewhere without further duplication.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-26 23:07:40 +01:00
Reimar Döffinger
fe343286ec Restore some more rules to common.mak to improve building in subdirs.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-06-25 19:15:39 +02:00
Reimar Döffinger
95dd1741af Allow running make in subdirs again. 2011-06-24 09:39:11 +02:00
Reimar Döffinger
2ec899222b Revert "build: move basic rules and variables to main Makefile"
This reverts commit bb5249244d.
This is necessary to allow running "make" in subdirs again.

Conflicts:

	Makefile
2011-06-24 09:09:55 +02:00
Michael Niedermayer
686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
Mans Rullgard
f038cf3c74 build: remove SRC_PATH_BARE variable
Setting SRC_PATH to "." when building in-tree removes the need
for a quoted version of the source path since out-of-tree builds
are not possible if the pathname contains spaces.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:17:25 +01:00
Mans Rullgard
bb5249244d build: move basic rules and variables to main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:17:08 +01:00
Mans Rullgard
8d853efe53 build: move special targets to end of main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:16:53 +01:00
Michael Niedermayer
4b87a088bf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: add --optflags option
  build: move documentation rules to doc/Makefile
  build: move test rules to tests/Makefile
  ac3enc: remove unneeded local variable in asym_quant()
  ac3enc: remove a branch in asym_quant() by doing 2 shifts
  ac3enc: avoid masking output in asym_quant() by using signed values for quantized mantissas.
  H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
  H.264: fix 4:4:4 + deblocking + MBAFF
  H.264: fix 4:4:4 cropping warning
  H.264: reference the correct SPS in decode_scaling_matrices
  H.264: fix bug in lossless 4:4:4 decoding

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-23 04:49:04 +02:00
Mans Rullgard
f87b03b50d build: move documentation rules to doc/Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-22 22:59:46 +01:00
Mans Rullgard
698a183e30 build: move test rules to tests/Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-22 22:53:07 +01:00
Michael Niedermayer
c137fdd778 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  swscale: remove misplaced comment.
  ffmpeg: fix streaming to ffserver.
  swscale: split out RGB48 output functions from yuv2packed[12X]_c().
  build: move vpath directives to main Makefile
  swscale: fix JPEG-range YUV scaling artifacts.
  build: move ALLFFLIBS to a more logical place
  ARM: factor some repetitive code into macros
  Fix SVQ3 after adding 4:4:4 H.264 support
  H.264: fix CODEC_FLAG_GRAY
  4:4:4 H.264 decoding support
  ac3enc: fix allocation of floating point samples.

Conflicts:
	ffmpeg.c
	libavcodec/dsputil_template.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/snow.c
	libswscale/swscale.c
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-15 02:15:25 +02:00
Mans Rullgard
d530e57944 build: move vpath directives to main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-14 19:53:53 +01:00
Mans Rullgard
cf53c48615 build: move ALLFFLIBS to a more logical place
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-14 10:59:56 +01:00
Michael Niedermayer
d127d26997 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: fix "make install" with documentation disabled
  build: simplify some conditional targets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-12 04:30:19 +02:00
Mans Rullgard
151c584188 build: fix "make install" with documentation disabled
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-11 20:35:53 +01:00
Mans Rullgard
623ffe8c82 build: simplify some conditional targets
Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-11 19:35:47 +01:00
Michael Niedermayer
40da61eff5 Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 04:43:03 +02:00
Michael Niedermayer
174df6affc Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: remove empty $(OBJS) target
  build: make rule for linking ff* apply only to these targets
  build: rearrange some lines in a more logical way
  s302m: fix resampling for 16 and 24bits.
  ARM: remove MUL64 and MAC64 inline asm
  build: clean up .PHONY lists
  build: move all (un)install* target aliases to toplevel Makefile
  flvenc: propagate error properly
  build: remove stale dependency
  build: do not add CFLAGS-yes to CFLAGS
  utils.c: fix crash with threading enabled.
  configure: simplify source_path setup
  configure: remove --source-path option
  lavf: deprecate AVFormatParameters.time_base.
  img2: add framerate private option.
  img2: add video_size private option.
  img2: add pixel_format private option.
  tty: add framerate private option.

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-07 03:37:57 +02:00
Mans Rullgard
6d170962bd build: make rule for linking ff* apply only to these targets
This ensures that the special link command using cmdutils.o
only applies to the targets it should.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-07 01:28:15 +01:00
Mans Rullgard
d93d7349ce build: rearrange some lines in a more logical way
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 23:21:12 +01:00
Mans Rullgard
0018b7f043 build: clean up .PHONY lists
This removes nonexisting targets from phony lists and puts them
all in one place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 16:56:53 +01:00
Mans Rullgard
d7a72d250b build: move all (un)install* target aliases to toplevel Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 16:56:53 +01:00
Michael Niedermayer
87f40364d1 Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  build: simplify commands for clean target
  swscale: split swscale.c in unscaled and generic conversion routines.
  swscale: cosmetics.
  swscale: integrate (literally) swscale_template.c in swscale.c.
  swscale: split out x86/swscale_template.c from swscale.c.
  swscale: enable hScale_altivec_real.
  swscale: split out ppc _template.c files from main swscale.c.
  swscale: remove indirections in ppc/swscale_template.c.
  swscale: split out unscaled altivec YUV converters in their own file.
  mpegvideoenc: fix multislice fate tests with threading disabled.
  mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
  build: Simplify texi2html invocation through the --output option.
  Mark some variables with av_unused
  Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().
  svq3: Check negative mb_type to fix potential crash.
  svq3: Move svq3-specific fields to their own context.
  rawdec: initialize return value to 0.
  Remove unused get_psnr() prototype
  rawdec: don't leak option strings.
  bktr: get default framerate from video standard.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-04 06:35:17 +02:00
Diego Biurrun
a5514a8474 build: Simplify texi2html invocation through the --output option.
The --output option is available in texi2html since at least version 1.78.
2011-06-03 15:43:05 +02:00
Michael Niedermayer
5a35cef4b1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: enable UAL syntax in asm.S
  v4l2: don't leak video standard string on error.
  swscale: Remove disabled code.
  avfilter: Surround function only used in debug mode by appropriate #ifdef.
  vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
  build: remove BUILD_ROOT variable
  vp8: use av_clip_uintp2() where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-30 01:29:11 +02:00
Mans Rullgard
798b264678 build: remove BUILD_ROOT variable
This variable is unnecessary as absolute paths are not required.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-29 12:36:16 +01:00
Michael Niedermayer
027264cb82 Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
  ARM: add ARMv6 optimised av_clip_uintp2
  ARM: remove volatile from asm statements in libavutil/intmath
  ARM: fix av_clipl_int32_arm()
  v4l: include avdevice.h
  ffserver: move close_connection() call to avoid a temporary string and copy.
  lavf: initialize demuxer private options.
  AVOptions: set string default values.
  lavdevice: mark v4l for removal on next major bump.
  swscale: fix compile on ppc.
  swscale: fix compile on x86-32.
  build: Remove generated .version file on distclean.
  configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2.
  doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected.
  ffplay: Remove disabled code.
  Mark parameterless function declarations as 'void'.
  swscale: use av_clip_uint8() in yuv2yuv1_c().
  swscale: remove VOF/VOFW.
  swscale: split chroma buffers into separate U/V planes.
  swscale: replace formatConvBuffer[VOF] by allocated array.
  rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-27 02:53:21 +02:00
Diego Biurrun
59748689f6 build: Remove generated .version file on distclean. 2011-05-26 16:26:18 +02:00
Michael Niedermayer
75a37b57a5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/dca.c
	libavcodec/h264.c
	libavcodec/mdec.c
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/version.h
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-19 06:00:31 +02:00
Mans Rullgard
f907ad9b85 Remove unused make variable SEEK_REFFILE
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 20:21:27 +01:00
Mans Rullgard
164c24c858 fate: remove redundant aref and vref references
The ref targets are included in the FATE_[AV]CODEC lists created
by configure so they do not need to be listed separately in the
makefile.  Filter them out when setting dependencies to avoid make
warnings about circular deps.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 19:24:35 +01:00
Mans Rullgard
70378ea190 fate: run aref and vref as regular tests
These tests create reference files used for psnr calculation in
the other codec tests.  Treating them as (mostly) regular tests
simplifies the makefile and makes them visible in the fate reports.
The latter makes errors in these runs easier to identify.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 14:45:46 +01:00
Michael Niedermayer
ccd77fe59b Makefile:Put lost tab back.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-06 02:21:52 +02:00
Francesco Cosoleto
6c2845600d fate: mention fate documentation in the error message
Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-06 00:30:02 +02:00
Michael Niedermayer
707e8612e8 Merge remote branch 'qatar/master'
* qatar/master:
  Implement fate-rsync target
  Make ffmpeg support generic data stream

Conflicts:
	cmdutils.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-04 04:06:26 +02:00
Reinhard Tartler
8ce67bcabe Implement fate-rsync target 2011-05-03 19:21:30 +02:00
Michael Niedermayer
8772156be0 Merge remote branch 'qatar/master'
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-22 03:54:30 +02:00
Ronald S. Bultje
3283f274fd FATE: allow forcing thread-type when doing threaded fate runs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-21 19:36:45 -04:00
Michael Niedermayer
10d2ae8cf7 Merge remote branch 'qatar/master'
* qatar/master:
  Makefile: Include dependencies for test tools, too
  Remove a version check in av_log made unnecessary by the big bump.
  update last major version increase dates in APIchanges
  Reduce picture size for yadif.
  oggdec: use av_freep() instead of av_free()
  avio: Fix sanity checks in ffurl_read*
  libavformat: Free AVFormatContext->streams
  libavformat: Make protocols pass URLContext as log context where available
  asf: remove commented out code in asf_read_seek
not pulled:  libpostproc: Remove crufty code disabled by the big bump.
  Reflect 0.7_beta1 release in the Changelog
not pulled:  sws: remove disabled cruft.
  lavu: remove disabled ff_random_get_seed cruft.
  lavu: remove disabled sha1 cruft.

Conflicts:
	Changelog
	libavutil/sha1.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-21 03:37:05 +02:00
Martin Storsjö
f83acb096c Makefile: Include dependencies for test tools, too
This makes seek_test to be rebuilt when its dependencies
has changed. The changes to the dependencies didn't usually matter
in practice, but the introduction of side data in AVPacket required
a recompilation.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-20 21:44:04 +03:00
Michael Niedermayer
bc6047223f Drop checkheaders from check, its useless
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-06 23:21:44 +02:00
Michael Niedermayer
b1ca9642a2 Revert "Remove support for stripping executables"
People did not like this change.

This reverts commit e0be794a71.
2011-04-01 00:24:12 +02:00
Michael Niedermayer
445fdc0140 Merge remote-tracking branch 'newdev/master'
* newdev/master:
  ac3enc: move compute_mantissa_size() to ac3dsp
  ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext
  Remove support for stripping executables
  ac3enc: NEON optimised float_to_fixed24
  ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
  dfa: protect pointer range checks against overflows.
Duplicate:  mimic: implement multithreading.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-30 03:09:08 +02:00
Mans Rullgard
e0be794a71 Remove support for stripping executables
Stripping is generally best left to package management tools, and
since unstripped copies are kept in the build tree, any arguments
about saving space (no matter how insignificant) are void.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-29 22:05:04 +01:00
Michael Niedermayer
2fd41c9067 Merge remote-tracking branch 'newdev/master'
* newdev/master:
  avio: make udp_set_remote_url/get_local_port internal.
  asfdec: also subtract preroll when reading simple index object
  matroskaenc: remove a variable that's unused after bc17bd9.
  avio: cosmetics - nicer vertical alignment.
  Remove unnecessary icc version checks
  Disable 'attribute "foo" ignored' warnings from icc
  rtsp: Don't use a locale dependent format string
  Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
  configure: get libavcodec version from new version.h header
  lavc: move the version macros to a new installed header.
  matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
  Do not use format string "%0.3f" for RTSP Range field.
  Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
  Document usage of import libraries created by dlltool
  configure: Set the correct lib target for arm/wince dlltool
  fate: simplify regression-funcs.sh
  fate: add support for multithread testing

Conflicts:
	libavformat/rtspdec.c
	libavutil/attributes.h
	libavutil/internal.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-24 02:16:11 +01:00
Luca Barbato
7851eb68c6 fate: add support for multithread testing
Add a THREADS variable to fate calls.
2011-03-23 01:17:20 +01:00
Michael Niedermayer
8ea36711b0 Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Not Pulled:
    commit 42cfb3835b
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Mon Feb 28 18:06:58 2011 +0000

        Remove Sonic experimental audio codec

    commit 2912e87a6c
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Fri Mar 18 17:35:10 2011 +0000

        Replace FFmpeg with Libav in licence headers
2011-03-19 20:05:11 +01:00
Janne Grunau
faa6f1c306 get rid of the last svn mentions 2011-03-18 21:57:38 +01:00
Michael Niedermayer
e528cdac8a Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
This reverts commit 29ba091136.
2011-03-17 17:26:45 +01:00
Janne Grunau
29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01:00
Mans Rullgard
08df7f8666 Makefile: include deps from tools directory
This ensures the tools are rebuilt when necessary.  Specifically,
lavfi-showfiltfmts was sometimes not rebuilt causing spurious test
failures.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-20 18:04:52 +00:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Stefano Sabatini
40321376d8 Allow "make clean" to clean files in tools
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-12 12:58:10 +00:00
Stefano Sabatini
cd6a5a57b8 Add lavfi-showfiltfmts and graph2dot to $(TOOLS)
Allow make clean to remove the corresponding binaries.

Fix issue 2162.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-12 12:55:31 +00:00
Mans Rullgard
a7878c9f73 VP8: ARM optimised decode_block_coeffs_internal
Approximately 5% faster on Cortex-A8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 15:48:11 +00:00
Mans Rullgard
f3619680a7 Makefile: remove unused variable ALLHTMLPAGES
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 12:33:13 +00:00
Mans Rullgard
7f939f55bb Makefile: build docs only for enabled tools; fix docs dependencies
This makes "make documentation" build the man/html pages only for
the tools enabled in the build.  It also fixes the dependency
tracking for the built man pages.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 12:33:09 +00:00
Mans Rullgard
a0f9c8ce37 Auto-generate dependencies for documentation
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 00:10:00 +00:00
Janne Grunau
a8f0814a74 doc: modify style for texi2html 1.78+
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
2011-01-29 16:57:29 +01:00
Mans Rullgard
3d157bf31f Makefile: fix cleaning of tools in tests directory
The variable TESTPROGS is reset by the library makefiles,
use another name.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 13:43:54 +00:00
Daniel Verkamp
3adbe49f2b Fix ALLPROGS_G so that *_g binaries get cleaned properly
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 12:46:10 +00:00
Mans Rullgard
2b39962eb6 Makefile: simplify test tools handling
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-23 13:55:35 +00:00
Mans Rullgard
583fcb528c Makefile: simplify setting of some variables
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 15:36:05 +00:00
Stefano Sabatini
ef298ea7ac Add demuxers.texi file.
Originally committed as revision 26282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-09 10:22:21 +00:00
Anton Khirnov
a46515115c Metadata muxer
Dumps all metadata to a text file for easy manual editing.

Originally committed as revision 26101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 07:46:49 +00:00
Stefano Sabatini
8399d23517 Add dependency for the libavfitler.html file.
Originally committed as revision 26078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-23 17:06:46 +00:00
Stefano Sabatini
82ccbe6b27 Simplify texi files naming: ff*-doc.texi -> ff*.texi.
Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-14 18:38:37 +00:00
Stefano Sabatini
fe858d7bd1 Define PODPAGES in Makefile, and make them depend on
fftools-common-opts.texi.

Fix pod files updating when fftools-common-opts.texi is changed.

Originally committed as revision 25928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-11 12:00:41 +00:00
Ramiro Polla
4d1156cb2c Fix building of object files in tools/
Fixes issue issue2408.

Originally committed as revision 25905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 11:42:19 +00:00
Stefano Sabatini
361d275879 Add a file for bitstream filters documentation.
Based on a patch by Nicolas George
<@var{name}.@var{surname}@@normalesup.@code{org}>.

Originally committed as revision 25709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-08 14:27:16 +00:00
Stefano Sabatini
07851d7936 Add eval.texi file.
Originally committed as revision 25665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 19:43:55 +00:00
Måns Rullgård
d29d9cccf8 fate: print list of tests with "make fate-list"
Originally committed as revision 24947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-26 13:58:45 +00:00
Vitor Sessak
680aefa2fe MP3 float decoder FATE tests
Originally committed as revision 24880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 12:17:03 +00:00
Måns Rullgård
715e9be267 fate: remove pointless fate/fate2 separation
Originally committed as revision 24868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-22 14:24:58 +00:00
Diego Biurrun
3123823cb2 Skip adding SDL_CFLAGS to CFLAGS for the ffplay.d target.
We no longer create .d files directly, so the rule is pointless.

Originally committed as revision 24805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 14:58:44 +00:00
Måns Rullgård
4c3fbd4f93 fate: move some groups of related tests to their own files
This moves some groups of tests for single codecs to separate files,
and adds shorthands for running all tests in a group.

Originally committed as revision 24697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 18:47:20 +00:00
Stefano Sabatini
43d2c6a511 Fix fate-lavfi-pixfmts test cross-compilation.
Add the lavfi-showfiltfmts dependency in the Makefile, and correctly
use the $target_exec and $target_path variables for invoking the
lavfi-showfiltfmts tool.

Originally committed as revision 24645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:27:04 +00:00
Stefano Sabatini
1de4cfe635 Add protocols.texi.
Originally committed as revision 24616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 15:45:29 +00:00
Stefano Sabatini
4419c8bf25 Add the indevs.texi and outdevs.texi files.
Originally committed as revision 24543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 13:10:59 +00:00
Måns Rullgård
b82be63688 fate: create report files
Originally committed as revision 24529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:44:06 +00:00
Måns Rullgård
ce3a841da1 Add a simple base64 encoder for use in tests
Originally committed as revision 24526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:43:56 +00:00
Måns Rullgård
9d0b304241 Do not automatically run configure
Making automatic reconfigure work properly in all cases proved more
difficult than it seemed, and people complained about it.  Instead,
print a warning when the configuration appears to be out of date.

Originally committed as revision 24436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-22 17:47:56 +00:00
Stefano Sabatini
aac6ca6978 Add libavcore.
The new library is meant to contain the core multimedia utilities for
FFmpeg, to make them shareable between more libav* libraries.

See thread:
Subject: [FFmpeg-devel] [RFC] New library for shared non-generic libav* utils
Date: Fri, 9 Jul 2010 01:07:40 +0200

Originally committed as revision 24393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 18:28:42 +00:00
Måns Rullgård
b3dce4b9bf Enable lavfi test in "make test"
Originally committed as revision 24382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 10:06:24 +00:00
Måns Rullgård
86601915d2 Rerun configure when all*.c files have changed
Originally committed as revision 24370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 18:10:27 +00:00
Måns Rullgård
f6ae77d469 Change message tag for tests to simply TEST
Originally committed as revision 24369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 18:10:24 +00:00
Måns Rullgård
57f096309a Remove old regtest make rules redirecting to fate-based ones
Originally committed as revision 24348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 10:19:31 +00:00
Måns Rullgård
9a3f31efcb fate: allow running regtests through fate frontend
Originally committed as revision 24347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 10:19:28 +00:00
Måns Rullgård
48c281629a Generate list of lavfi tests in configure
Originally committed as revision 24329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 17:17:43 +00:00
Måns Rullgård
2e204aeb1b fate: echo fate-run command with V=1
Originally committed as revision 24328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 17:17:39 +00:00
Måns Rullgård
34ae2d90e0 Remove dead target from .PHONY list
Originally committed as revision 24151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 23:37:19 +00:00
Måns Rullgård
7e264ca136 fate: add oneoff test for twinvq
Originally committed as revision 24135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 00:40:55 +00:00
Måns Rullgård
aab3ea5f7d fate: add oneoff comparison method
This adds the 'oneoff' comparison method.  It compares two s16le pcm
files with a max difference <= the fuzz factor treated as success.
Default fuzz is 1.  On failure, the full tiny_psnr output is printed.

Originally committed as revision 24134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 00:40:51 +00:00
Måns Rullgård
3ade7d32c1 fate: pass additional variables to test script
This passes the following additional variables to the test script:

- CMP  method to use comparing output with reference, default 'diff'
- REF  reference file, default 'tests/ref/fate/${test}'
- FUZZ maximum fuzz factor in comparison, meaning depends on CMP

Originally committed as revision 24133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 00:40:45 +00:00
Måns Rullgård
f955d45226 Change names of regtest output files to closer match the reference files
Originally committed as revision 24127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 22:10:14 +00:00
Måns Rullgård
9770a7ad0e Simplify regtest reference makefile dependencies
Originally committed as revision 24121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 18:44:08 +00:00
Måns Rullgård
57442411d7 Move regression test dependencies to configure
This allows expressing complex dependencies more easily.

Originally committed as revision 24120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 18:44:06 +00:00
Måns Rullgård
9be24c60d3 Create the regtest reference files only when necessary
This avoid recreating the ref files every time an individual test
is run from the command line.

Originally committed as revision 24113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 15:30:30 +00:00
Måns Rullgård
e1621087b6 Clean up make rules for calling codec test scripts
Originally committed as revision 24112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 15:30:25 +00:00
Måns Rullgård
4ab20de636 Beautify make messages when generating test data files
Originally committed as revision 24111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 15:30:23 +00:00
Stefano Sabatini
ce2e4ae35a Add pixdesctest filter and corresponding test.
Originally committed as revision 24092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 18:24:55 +00:00
Stefano Sabatini
3275ac6a23 Make the ffmpeg and ffplay man pages show the list of lavfi filters,
sinks and sources, and document the -vf option.

Originally committed as revision 23689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 22:09:07 +00:00
Stefano Sabatini
dd46b538ec Update documentation dependencies, make ff* tools manpages and HTML
pages depend of fftools-common-opts.texi.

Originally committed as revision 23687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 21:38:19 +00:00
Michael Niedermayer
59b847d3a9 Add simple rgb/yuv in avi regression test.
Originally committed as revision 23501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 00:05:12 +00:00
Stefano Sabatini
e34d5db595 Add libavfilter 1-input - 1-output regression test, corresponding to the
target regtest-lavfi_pix_fmts.

The lavfi_pix_fmts test is disabled, this because there are
many tests which are failing, and there are still some output files
which cannot be played by NUT/ffplay.

Originally committed as revision 23297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 20:38:50 +00:00
Måns Rullgård
666d7d18e1 FATE: print friendly error for individual tests when SAMPLES unset
Originally committed as revision 23079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 09:32:59 +00:00
Vitor Sessak
1840b28059 Makefile: make fate target depend on compiling ffmpeg
Originally committed as revision 22912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-19 13:05:26 +00:00
Stefano Sabatini
cec96e8de3 Add some ad-hoc tests for libavfilter.
A patched version of ffmpeg supporting video filters is required for
getting this working; thus make lavfitest is supposed to work only in
the libavfilter repository for now.

Originally committed as revision 22586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 23:23:44 +00:00
Måns Rullgård
2fad097788 Add FATE tests
This adds a "fate" make target which runs the full FATE test suite.
Individual tests can be run with "make fate-$testname".

The location of the FATE test samples must be specified with the
--samples=PATH option to configure.

The tests/fate-update.sh script regenerates the references files and
test list from the online FATE database.  These are checked in since
generating them requires non-standard tools.

Originally committed as revision 22552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 19:23:24 +00:00
Måns Rullgård
7732f641ff Fix brief make output for generated tables
Originally committed as revision 22526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 19:48:09 +00:00
Måns Rullgård
0853a2b47e 10l: fix version.h generation
Note to self: always test in a clean directory

Originally committed as revision 22423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 03:10:26 +00:00
Måns Rullgård
f82bf85055 Make version.h depend on git changes
Originally committed as revision 22421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:56:59 +00:00
Måns Rullgård
6a53fffd77 Improve version.h generation
Force version.sh to run whenever the version might have changed,
regardless of what is being built.  This is done by attaching the
dependencies to a dummy file (.version) which is included from the
makefile.  As make will always attempt to rebuild any included files
before considering other rules, this ensures that the real version.h
is (re-)created before it is required by any source file.

Originally committed as revision 22420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:56:56 +00:00
Måns Rullgård
86be2bc36f Prettify make output for documentation
Originally committed as revision 22418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:56:50 +00:00
Måns Rullgård
b91cd80917 Change dir into doc/ when running texi2html
This silly program always writes its output to the current directory.
Changing directory is better than moving the file afterwards.

Originally committed as revision 22417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 02:56:47 +00:00
Måns Rullgård
f89c14027a checkheaders: skip per-arch headers not meant for direct inclusion
Some of the per-arch headers are only meant to be used through
the parent header of the same name.  Testing these standalone
does not make sense.

Originally committed as revision 22341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 20:17:47 +00:00
Måns Rullgård
2a5500b13e Add TESTOBJS make variable for extra objects used by test apps
Originally committed as revision 22335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:44 +00:00
Måns Rullgård
9b55e2e727 Skip cmdutils_common_opts.h fragment in checkheaders
Originally committed as revision 22333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:38 +00:00
Måns Rullgård
63611f31e8 Prettify make output
This gives brief messages from make by default.  For full command
echoing, add V=1 to make command line.

Originally committed as revision 22244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:19 +00:00
Måns Rullgård
fd676deb96 Add INSTALL makefile variable
Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:13 +00:00
Måns Rullgård
b578357e59 Use mkdir -p to create directories
Originally committed as revision 22241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:11 +00:00
Måns Rullgård
4335125ccc Add CP make variable
Originally committed as revision 22240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:08 +00:00
Måns Rullgård
50e10cbd7a Use $(RM) to delete files
Originally committed as revision 22234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:25:10 +00:00
Måns Rullgård
d7096d6fdd Run seektest on all generated files
Originally committed as revision 22158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:59:16 +00:00
Måns Rullgård
801b571e33 Remove unused argument to test scripts
Originally committed as revision 22156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:42:03 +00:00
Stefano Sabatini
336ce917e6 Add FFprobe tool.
This is a simplified / cleaned-up version of the SourceForge program:
http://sourceforge.net/projects/ffprobe/

Syntax / features may be different, in particular the options
-show_packets and -show_frames are not yet supported in this version.

Originally committed as revision 21936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-21 11:43:01 +00:00
Måns Rullgård
2897dc780a Delete avconfig.h on distclean
Originally committed as revision 21920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 13:19:34 +00:00
Måns Rullgård
b6fa8e35f2 Delete all test related files in testclean rule
Originally committed as revision 21919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 13:19:29 +00:00
Måns Rullgård
c676895fd9 Separate audio-only tests so they are only run once
Originally committed as revision 21556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:47:13 +00:00
Måns Rullgård
97d5fa38e0 10l: fix linking
Alphabetical order isn't always a good idea.

Originally committed as revision 21472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:26:41 +00:00
Måns Rullgård
5a0f713118 Allow disabling of lavc, lavf, lavd, and lsws
Originally committed as revision 21468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-26 23:13:01 +00:00
Ramiro Polla
d3cb93b374 Revert r21226, it was a joke:
Get one step closer to world domination.
Remove "make uninstall".

Originally committed as revision 21466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-26 22:23:12 +00:00
Måns Rullgård
aa310a9fc7 Add rules to install generated headers
Originally committed as revision 21320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 04:40:13 +00:00
Måns Rullgård
05e24fa852 regtest: run tests only for enabled codecs and formats
Originally committed as revision 21256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 20:18:24 +00:00
Måns Rullgård
4b294c1872 regtest: split wma test into wmav1 and wmav2
Originally committed as revision 21255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 20:18:22 +00:00
Måns Rullgård
eca478c317 regtest: split reference files allowing tests to run individually
With this change, the output is checked immediately after each test
has run.  This means commands like "make regtest-mpeg2" can now be
used to run a single test and get meaningful results.

By default, make will abort if any test fails.  To run all tests
regardless, use make -k.

Originally committed as revision 21254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 20:18:13 +00:00
Ramiro Polla
93fe7eb68d Get one step closer to world domination.
Remove "make uninstall".

Originally committed as revision 21226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 19:16:28 +00:00
Reimar Döffinger
ae5e8caa3d Add ROQ format regression test.
Originally committed as revision 20811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 17:34:24 +00:00
Måns Rullgård
00962abaa0 Fix make install when all of ffmpeg/ffplay/ffserver are disabled
Originally committed as revision 20501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-10 15:56:03 +00:00
Måns Rullgård
c73f65d979 Allow disabling doc generation with --disable-doc
Originally committed as revision 20424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-31 15:58:49 +00:00
Måns Rullgård
a48289c7b7 Makefile cosmetics
Originally committed as revision 20422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-31 15:58:39 +00:00
Måns Rullgård
de4070b520 Add generic rules for building helpers with HOSTCC
Originally committed as revision 20412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-29 00:55:35 +00:00
Stefano Sabatini
77f66963b0 Split codec-regression.sh again and create a lavfi-regression.sh for
running the libavfilter tests.

Originally committed as revision 20384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-27 19:34:48 +00:00
Stefano Sabatini
8f1e4d4ffc Split codec-regression.sh, and create the lavf-regression.sh script.
Originally committed as revision 20365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 17:01:47 +00:00
Stefano Sabatini
dba755facc Rename vfilters.texi to libavfilter.texi, as the file is meant to
document libavfilter and not only its video filtering facilities.

Originally committed as revision 20338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-21 18:22:20 +00:00
Diego Biurrun
15674f12be cosmetics: Break overly long lines.
Originally committed as revision 20276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 10:47:40 +00:00
Stefano Sabatini
1f09ab5e66 Add documentation for libavfilter video filters.
Originally committed as revision 20271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 07:46:06 +00:00
Justin Ruggles
9797ce58b7 Add ALAC encoding and decoding regression tests.
Originally committed as revision 20188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-06 22:47:33 +00:00
Stefano Sabatini
40e024091d Implement a lavfitest target for testing regressions in libavfilter.
The target is disabled.

See the thread: "[PATCH] libavfilter-soc: regression test for libavfilter".

Originally committed as revision 20057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-27 09:33:37 +00:00
Måns Rullgård
96fdb62428 Split dnxhd regression test so the parts can run in parallel
Originally committed as revision 19936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 01:40:12 +00:00
Diego Biurrun
94f3c0e52f Add probetest to TOOLS list.
Originally committed as revision 19909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 10:25:25 +00:00
Diego Biurrun
13b1c80b05 Introduce a variable for all targets in the tools subdirectory.
Originally committed as revision 19908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 10:24:47 +00:00
Reimar Döffinger
a5083f66c7 Add dnxhd test to regression tests.
Originally committed as revision 19895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:06:03 +00:00
Diego Biurrun
2205da0d11 Fix typo: '.' was used instead of '/' as directory separator.
Originally committed as revision 19807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-10 09:30:57 +00:00
Måns Rullgård
95f2c769c3 Skip headers requiring external libs not present in checkheaders
Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-23 11:02:37 +00:00
Måns Rullgård
bea81a52c9 Replace BUILD_{SHARED,STATIC} with CONFIG_ counterparts
Originally committed as revision 19527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-28 08:58:48 +00:00
Måns Rullgård
2dfa305438 Fix building of tools/*
Fixes issue 1282

Originally committed as revision 19486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-22 16:14:59 +00:00
Diego Biurrun
4e67aedd6a Make sure that tests/seek_test.o gets deleted on 'make clean'.
Closes issue 1273.

Originally committed as revision 19458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-17 14:08:06 +00:00
Måns Rullgård
684b28e09c Use LD for linking, default to same as CC
Originally committed as revision 19407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:40 +00:00
Diego Biurrun
a752069dba Split developer documentation off from general documentation.
Originally committed as revision 19269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 22:58:58 +00:00
Stefano Sabatini
2795e3573d Consistently rename variables denoting regression reference file(s)
using the _REFFILE(S) postfix, and regression result file(s) using the
_RESFILE(S) postfix.
Improve legibility.

Originally committed as revision 19253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 22:56:18 +00:00
Stefano Sabatini
97668ac7f3 Rename tests/ffmpeg.regression.ref to tests/vsynth.regression.ref,
since that is the name of the corresponding test.

Originally committed as revision 19220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 23:44:05 +00:00
Måns Rullgård
0c3b2d6586 Add "config" make target to rerun configure with old options
Originally committed as revision 19202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 22:12:23 +00:00
Dave Yeo
2b7a351eb9 Remove $(CLEANSUFFIXES) and $(DISTCLEANSUFFIXES) on clean/distclean
in the root directory as well as in subdirectories.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 18973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-28 22:13:17 +00:00
Diego Biurrun
cc013a7423 The MLP optimizations do not depend on HAVE_MMX, but on ARCH_X86.
Build them when ARCH_X86 is enabled. Fixes linking with MMX disabled.

Originally committed as revision 18945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 19:02:35 +00:00
Ramiro Polla
07116be05a NEON-OBJS should also be cleared for each subdir.
Originally committed as revision 18944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 18:46:47 +00:00
Diego Biurrun
d7167f0555 Move generated file aynth1.sw to the data subdirectory. Thus it does not have
to be removed separately and there is less clutter in the tests directory.

Originally committed as revision 18246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-30 12:27:03 +00:00
Diego Biurrun
6117ffbe90 Rename regression.sh --> codec-regression.sh. Now all regression test scripts
carry the regression test they run as prefix in their name.

Originally committed as revision 18245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-30 12:00:16 +00:00
Diego Biurrun
767e14c380 Rename server-regression.sh --> ffserver-regression.sh for consistency.
Originally committed as revision 18243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-30 10:05:00 +00:00
Diego Biurrun
996a92c04d Rename servertest target to ffservertest.
Originally committed as revision 18242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-30 05:24:10 +00:00
Diego Biurrun
f1f66d3afd Rename libav.regression.ref --> lavf.regression.ref.
This matches the new name of the test target.

Originally committed as revision 18228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 21:27:24 +00:00
Diego Biurrun
1cde611d80 Rename libavtest target to lavftest to better express what it tests.
Also rename related variables to match the new name.

Originally committed as revision 18227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 21:24:04 +00:00
Diego Biurrun
688a477367 Rename test.conf --> ffserver.conf, the new name is more meaningful.
Originally committed as revision 18226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 20:17:23 +00:00
Diego Biurrun
62cb577e39 Rename seek_test.sh --> seek-regression.sh for greater consistency.
Originally committed as revision 18220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-29 17:22:07 +00:00
Diego Biurrun
d95a0c67ae Move output_example.c --> libavformat/output-example.c.
The libavformat directory is a better place for a libavformat API example.

Originally committed as revision 18199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-27 00:01:06 +00:00
Diego Biurrun
3ec88c74b0 Remove unnecessary CFLAGS variable from output_example link command.
Originally committed as revision 18197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-26 17:16:11 +00:00
Diego Biurrun
219a7185a0 Removing example programs is already handled by the generic clean commands,
so there is no need to remove output_example individually.

Originally committed as revision 18196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-26 14:37:14 +00:00
Ramiro Polla
1bbeb23356 Clear some more variables that are used on subdir Makefiles.
Originally committed as revision 18180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 00:50:56 +00:00
Diego Biurrun
661ce28996 Rename 'tests' target to 'testprogs'. It is too easily confused with the
'test' target and a directory named tests exists.

Originally committed as revision 18165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 23:13:21 +00:00
Diego Biurrun
6708cfc4d3 Add rule for building API example programs.
Originally committed as revision 18161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 22:33:41 +00:00
Daniel Verkamp
effcedf738 PCX encoder that handles 1-, 8-, and 24-bpp pixfmts.
Patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 18077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 17:23:45 +00:00
Diego Biurrun
38eb4b114d Remove 'lib' and 'swscale-error' from list of phony targets.
Both targets no longer exist.

Originally committed as revision 17951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 15:56:29 +00:00