1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

2012 Commits

Author SHA1 Message Date
Diego Biurrun
c73b779d35 configure: Include AVX availability in summary output. 2011-05-15 13:11:01 +02:00
Reinhard Tartler
c1f5447805 configure: use same CPPFLAGS in kFreeBSD as Linux
046f081b46 reorganized the CPPFLAGS to no
longer add -D_POSIX_C_SOURCE unconditionally, but only on systems (e.g.,
glibc based ones) that require it.  As kFreeBSD uses glibc, it needs to
be treated similar.

Additionally, _BSD_SOURCE is turned on to enable some additional types
such as caddr_t, which are normally enabled on BSD but not with glibc.
2011-05-15 10:33:52 +02:00
Michael Niedermayer
29ef0174cc UDP: udp depends on pthreads now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-13 17:49:00 +02:00
Anton Khirnov
8fb566fdf8 ffmpeg: get rid of the 'q' key schizofrenia
SIGINT for quitting should be enough for everybody.
2011-05-13 07:38:54 +02:00
Michael Niedermayer
72153419b5 Merge remote branch 'qatar/master'
* qatar/master: (33 commits)
  rtpdec_qdm2: Don't try to parse data packet if no configuration is received
  ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
  ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
  mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
  srtdec: make sure we don't write past the end of buffer
  wmaenc: improve channel count and bitrate error handling in encode_init()
  matroskaenc: make sure we don't produce invalid file with no codec ID
  matroskadec: check that pointers were initialized before accessing them
  lavf: fix function name in compute_pkt_fields2 av_dlog message
  lavf: fix av_find_best_stream when providing a wanted stream.
  lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
  ffmpeg: factorize quality calculation
  tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
  tiff: Prefer enum TiffCompr over int for TiffContext.compr.
  mov: Support edit list atom version 1.
  configure: Enable libpostproc automatically if GPL code is enabled.
  Cosmetics: fix prototypes in oggdec
  oggdec: fix memleak with continuous streams.
  matroskaenc: add missing new line in av_log() call
  dnxhdenc: add AVClass in private context.
  ...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
	configure
	ffmpeg.c
	libavformat/matroskaenc.c
	libavutil/pixfmt.h
	libswscale/ppc/swscale_template.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/fate/h264.mak
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_copy_le
	tests/ref/lavfi/pixfmts_null_le
	tests/ref/lavfi/pixfmts_scale_le
	tests/ref/lavfi/pixfmts_vflip_le

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-13 04:40:40 +02:00
Måns Rullgård
ced9556b61 configure: Enable libpostproc automatically if GPL code is enabled.
Enabling libpostproc automatically should give it more compile coverage
and save the FATE box maintainers some configuration hassles.
2011-05-12 15:32:57 +02:00
Stefano Sabatini
92fe258756 configure: sort filter deps entries
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-12 13:02:37 +02:00
Diego Biurrun
046f081b46 configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS.
Adding _POSIX_C_SOURCE to CPPFLAGS globally produces all sorts of problems
since it causes certain system functions to be hidden on some (BSD) systems.
The solution is to only add the flag on systems that really require it, i.e.
glibc-based ones.

This change makes BSD systems compile out-of-the-box without the need for
adding specific flags manually.  It also allows dropping a number of flags
set manually on a file-per-file basis, but were only present to work around
breakage introduced by the presence of _POSIX_C_SOURCE.

Also add _XOPEN_SOURCE to CPPFLAGS for glibc systems.  We use XSI extensions
in several places already, so it is preferable to define it globally instead
of littering source files with individual #defines only needed for glibc.
2011-05-12 11:41:59 +02:00
Kyle
de545d2491 configure: Fix SDL detection on OSX and win32 2011-05-11 20:24:38 +02:00
Michael Niedermayer
b97b4b58a6 Merge remote branch 'qatar/master'
* qatar/master:
  mpegaudiodec: group #includes more sanely
  mpegaudio: remove #if 0 blocks
  ffmpeg.c: reset avoptions after each input/output file.
  ffmpeg.c: store per-output stream sws flags.
  mpegaudio: remove CONFIG_MPEGAUDIO_HP option
  mpegtsenc: Clear st->priv_data when freeing it
  udp: Fix receiving RTP data over multicast
  rtpproto: Remove an unused variable
  regtest: fix wma tests
NOT pulled:  mpegaudio: remove CONFIG_AUDIO_NONSHORT
  regtest: separate flags for encoding and decoding

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-10 04:03:17 +02:00
Michael Niedermayer
ca87d43906 configure: Revert sdl hunk of 4fa18c56. This breaks OSX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-10 03:22:04 +02:00
Mans Rullgard
6bb6fb05ba mpegaudio: remove CONFIG_MPEGAUDIO_HP option
The low quality mode is off by default and never tested.  The high
quality mode is also plenty fast enough.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-09 17:30:12 +01:00
Michael Niedermayer
6d6b0c96fd Merge remote branch 'qatar/master'
* qatar/master:
  drawtext: add documentation for the shadow parameters
  drawtext: add shadow support.
  drawtext: factor draw_glyphs.
  drawtext: fix and optimize yuv blend.
  drawtext: get rid of divisions in the inner loop.
  drawtext: simplify chroma blend and fix chroma alpha.
  lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

Conflicts:
	configure
	libavfilter/avfilter.h
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 03:29:51 +02:00
Stefano Sabatini
a5b64584f3 lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo
With the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
* fix minor errors and typos in the filter description
* extend/clarify examples in the filter description

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:17:40 +02:00
Michael Niedermayer
6dc30b25c5 Merge remote branch 'qatar/master'
* qatar/master:
  configure: warn if pkg-config is missing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-06 04:28:23 +02:00
Carl Eugen Hoyos
cde5589717 Silence a warning if pkg_config is not installed. 2011-05-06 03:27:53 +02:00
Mans Rullgard
762f95e4cb configure: warn if pkg-config is missing
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-05 18:29:55 +01:00
Stefano Sabatini
5d2ce3a778 configure: add strong dependencies for movie source and mp filter 2011-05-05 18:32:09 +02:00
Michael Niedermayer
b000b86e1d Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  doc: Check standalone compilation before submitting new components.
  Fix standalone compilation of pipe protocol.
  Fix standalone compilation of ac3_fixed encoder.
  Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
  Fix standalone compilation of IMC decoder.
  Fix standalone compilation of WTV demuxer.
  Fix standalone compilation of MXPEG decoder.
  flashsv: K&R cosmetics
  matroskaenc: fix memory leak
  vc1: make overlap filter for I-frames bit-exact.
  vc1dec: use s->start/end_mb_y instead of passing them as function args.
  Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
  Replace strncpy() with av_strlcpy().
  indeo3: Eliminate use of long.
  get_bits: make cache unsigned to eliminate undefined signed overflow.
  asfdec: fix assert failure on invalid files
  avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled:  mpegvideo: reindent.
  nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg  *: don't av_malloc(0).
  ...

Conflicts:
	doc/developer.texi
	libavcodec/Makefile
	libavcodec/get_bits.h
	libavcodec/mpegvideo.c
	libavformat/Makefile
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05 03:30:24 +02:00
Michael Niedermayer
6dafa7065b configure: jack currently needs sem_timedwait()
Should fix ticket99 and ticket43 by disabling jack.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-04 23:33:59 +02:00
Michael Niedermayer
5258f64a14 Disable warnings for casting pointers to integers, there is nothing wrong with that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-04 23:33:59 +02:00
Diego Biurrun
3d26905925 Fix standalone compilation of ac3_fixed encoder. 2011-05-04 21:12:41 +02:00
Diego Biurrun
a33657ce5b Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. 2011-05-04 21:12:41 +02:00
Diego Biurrun
56c8227d46 Fix standalone compilation of IMC decoder. 2011-05-04 21:12:41 +02:00
Michael Niedermayer
455ce979d0 Merge remote branch 'qatar/master'
* qatar/master:
LOTS of duplicates ...
  avio: Fix the deprecated fallback URL-prefixed open flags
  avoid duplicate -lm in .pc files
  mpeg12: terminate mpeg2_video_profiles arrays
  network: Check POLLERR and POLLHUP in ff_network_wait_fd
  mpegtsenc: make PMT PID really start on pmt_start_pid
  nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
  crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
  libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation

Conflicts:
	configure
	libswscale/swscale.h
	tests/ref/lavf/ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-29 04:29:21 +02:00
Joshua Warner
3f6dc4a130 encoder for adobe's flash ScreenVideo2 codec 2011-04-29 02:35:59 +02:00
Reinhard Tartler
05a18adfb1 avoid duplicate -lm in .pc files 2011-04-28 11:14:42 +02:00
Reimar Döffinger
663d002410 Remove now unused audio_float configure option. 2011-04-25 16:51:27 +02:00
Michael Niedermayer
989fb05fe3 Merge remote branch 'qatar/master'
* qatar/master:
  vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
  applehttp: Don't export variant_bitrate if it isn't known
  crypto: Use av_freep instead of av_free
  configure: Add missing libm library dependencies to .pc files.
  oggdec: reindent after 8f3eebd6
  configure: Add missing libavutil inter-library dependencies to .pc files.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-25 02:29:09 +02:00
Reinhard Tartler
50f7c29646 configure: Add missing libm library dependencies to .pc files.
This unbreaks static compilation using pkg-config on systems in need of -lm.
Based on an mplayer2 patch by Uoti Urpala <uau@mplayer2.org>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-04-24 17:24:24 +02:00
Reinhard Tartler
e9251bb555 configure: Add missing libavutil inter-library dependencies to .pc files.
This unbreaks static compilation when using pkg-config.
Based on an mplayer2 patch by Uoti Urpala <uau@mplayer2.org>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-04-24 15:15:14 +02:00
Michael Niedermayer
13e69cc5fa Fix building on FreeBSD8.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-24 13:23:51 +02:00
Michael Niedermayer
7b376b398a Merge remote branch 'qatar/master'
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-24 03:41:22 +02:00
Alex Converse
cfc2a0cf84 Remove RDFT dependency from AAC decoder.
$subj

>From 557176d961c70604c2a96d81aff4bd6faa670d8a Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Thu, 21 Apr 2011 12:11:42 -0700
Subject: [PATCH] Remove RDFT dependency from AAC decoder.
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1"

This is a multi-part message in MIME format.
--------------1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

It was used for an old implementation of the SBR filterbank.

./configure --disable-everything --disable-ffplay --enable-decoder=aac works.
2011-04-22 20:38:38 -07: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
Martin Storsjö
23d3931a6a Provide a fallback version of the libm function trunc
This fixes compilation on DOS.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-21 14:13:09 +03:00
Nicolas George
89451dd6e4 Xiph CELT/Opus decoder using libcelt.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
2011-04-20 10:46:30 +02:00
Michael Niedermayer
9891004ba9 Merge remote branch 'qatar/master'
* qatar/master:
Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
  Error out if vaapi is not found
  avio: undeprecate av_url_read_fseek/fpause under nicer names
  libvo-*: Don't use deprecated sample format names and enum names
DUPLICATE  flvdec: Fix support for flvtool2 "keyframes based" generated index
DUPLICATE  libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
  Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
  Convert some undefined 1<<31 shifts into 1U<<31.

Conflicts:
	configure
	libavcodec/libvo-aacenc.c
	libavcodec/libvo-amrwbenc.c
	libavformat/flvdec.c

Marged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-13 02:49:22 +02:00
Luca Barbato
f3e3f28e80 Error out if vaapi is not found
Make the behaviour consistent with the other external deps.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-12 19:17:06 +02:00
James Zern
8eeed0db05 vpxenc: add CQ_LEVEL mapping
via the equivalent AVCodecContext::crf modifying the range allowed by
options.c (0-51 -> 0-63)
update configure check to require libvpx 0.9.6 (Bali)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-12 03:54:28 +02:00
Michael Niedermayer
4727ec3c0e Merge remote branch 'qatar/master'
* qatar/master:
Not pulled due to wrong author, according to carl:  Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
  Fix compilation of timefilter test program.
  Add support for AMR-WB encoding via libvo-amrwbenc
  Add an AAC encoder by using the libvo-aacenc library
  g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-12 03:48:21 +02:00
Martin Storsjö
f502ff3f61 Add support for AMR-WB encoding via libvo-amrwbenc
The wrapper code is based on the libamr wrapper removed in SVN rev 19365.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-11 14:55:53 +03:00
Martin Storsjö
d89e738a0c Add an AAC encoder by using the libvo-aacenc library
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-11 14:55:51 +03:00
Philip Langdale
f6421e0b5c CrystalHD: Bring in h.264 parser to establish picture type.
As the hardware is unreliable, we will have to use the h.264 parser
to identify whether an input picture is a field or a frame. This
change loads the parser and extracts the picture type.

Signed-off-by: Philip Langdale <philipl@overt.org>
2011-04-08 20:17:47 -07:00
Michael Niedermayer
11d78415ca Merge remote branch 'qatar/master'
* qatar/master:
  psymodel: extend API to include PE and bit allocation.
  avio: always compile dyn_buf functions
  Remove unnecessary parameter from ff_thread_init() and fix behavior
  Revert "aac_latm_dec: use aac context and aac m4ac"
  configure: tell user if libva is enabled like the rest of external libs.
  Add silence support for AV_SAMPLE_FMT_U8.
  avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
  avio: deprecate av_url_read_seek
  avio: deprecate av_url_read_pause
  ac3enc: NEON optimised extract_exponents

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-06 02:59:49 +02:00
Michael Niedermayer
0c72180ea6 Revert "Set the correct target for mingw64 dlltool"
Revert due to dlltool/lib revert
This reverts commit 417516f63f.
2011-04-06 01:09:04 +02:00
Carl Eugen Hoyos
71a2da30cd Add audio_float to confgigure's CONFIG list. 2011-04-05 15:14:51 +02:00
Konstantin Pavlov
f4f05c459c configure: tell user if libva is enabled like the rest of external libs.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-05 09:09:08 +02:00
Michael Niedermayer
2cae9809e2 Merge remote branch 'qatar/master'
* qatar/master:
  fate: fix partial run when no samples path is specified
  ARM: NEON fixed-point forward MDCT
  ARM: NEON fixed-point FFT
  lavf: bump minor version and add an APIChanges entry for avio changes
  avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
  avio: make url_fdopen internal.
  avio: make url_open_dyn_packet_buf internal.
  avio: avio_ prefix for url_close_dyn_buf
  avio: avio_ prefix for url_open_dyn_buf
  avio: introduce an AVIOContext.seekable field
  ac3enc: use generic fixed-point mdct
  lavfi: add fade filter
  Change yadif to not use out of picture lines.
  lavc: deprecate AVCodecContext.antialias_algo
  lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
	doc/filters.texi
	libavcodec/ac3enc_fixed.h
	libavcodec/ac3enc_float.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-04 02:15:12 +02:00
Mans Rullgard
906fd03070 fate: fix partial run when no samples path is specified
This restores the behaviour of running only the builtin
regression tests when no path to external samples is given.
aa3805a inadvertently broke this by always setting SAMPLES
to something.  Using := makes the ifdef test work as expected
when the FATE_SAMPLES environment variable is empty.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-03 23:16:45 +01:00
Michael Niedermayer
85c9365d65 Revert "configure: use dlltools instead of lib.exe"
Reason, is this was requested by the windows experts / seems dlltool causes alot of problems

This reverts commit ec10a9ab46.

Conflicts:

	configure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 02:06:31 +02:00
Carl Eugen Hoyos
ecf94986c8 Fix compilation with --disable-vdpau 2011-04-02 00:50:39 +02:00
Michael Niedermayer
7ac167493e Merge remote-tracking branch 'newdev/master'
* newdev/master:
  mpegts: propagate avio EOF in read_packet()
  configure: Initial support for --target-os=symbian
  Fixed-point FFT and MDCT
  Include dependencies for test programs
  ac3enc: simplify sym_quant()
  flvdec: read index stored in the 'keyframes' tag.
  mov: Add support for zero-sized stsc runs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 02:58:15 +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
Martin Storsjö
1c69c79f2b configure: Initial support for --target-os=symbian
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-03-31 15:38:58 +03:00
Michael Niedermayer
8b8bf89e52 Revert "Do no modify terminal parameters using termios.h"
This reverts commit cb48e245e6.

Reason being we like pressing "q" to quit ffmpeg.

Conflicts:

	ffmpeg.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-31 00:22:29 +02:00
Gwenole Beauchesne
da3716021b vaapi: allow build against older VA-API 0.31. 2011-03-30 16:15:29 +02:00
Gwenole Beauchesne
dd950e2ebb vaapi: require version >= 0.32.0. 2011-03-30 16:15:29 +02:00
Gwenole Beauchesne
f9c215e260 vaapi: move configure check down. 2011-03-30 16:15:29 +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
Mans Rullgard
6d9f52b2cd ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-29 19:31:45 +01:00
Gwenole Beauchesne
f99abb15a1 vaapi: disable if check_lib failed. 2011-03-29 09:39:30 +02:00
Gwenole Beauchesne
5c98af952d Fix check for new enough CrystalHD library.
Signed-off-by: Philip Langdale <philipl@overt.org>
2011-03-28 21:19:07 -07:00
Stefano Sabatini
c6f951442e framebuffer device demuxer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-28 16:49:22 +02:00
Michael Niedermayer
25d8099beb Merge remote-tracking branch 'newdev/master'
* newdev/master:
  ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED:  Remove arrozcru URL from documentation
  sndio support for playback and record

Conflicts:
	doc/faq.texi
	doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-28 01:50:36 +02:00
Brad
15d59d2cea sndio support for playback and record
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-27 10:46:45 +02:00
Philip Langdale
b45aceb64a Revert "CrystalHD: Improve interlaced h.264 support."
This reverts commit e44073ca5e.
2011-03-26 16:04:48 -07:00
Philip Langdale
e44073ca5e CrystalHD: Improve interlaced h.264 support.
As previously discussed, the CrystalHD hardware returns exceptionally
useless information about interlaced h.264 content - to the extent
that it's not possible to distinguish MBAFF and PAFF content until
it's too late.

This change introduces use of the h264_parser to help bridge the
gap; it can indicate if the input data is PAFF fields or not.

With this clarity, some of heuristics can be removed from the code,
making this less convoluted.

Finally, I found an MBAFF clip that acts like non h.264 content so
I had to make allowances for that.

Note that I still cannot distinguish between two forms of PAFF,
where the hardware either returns individual fields or a field-pair.
It's not clear that there's even a spec relevant difference between
the two forms, as opposed to hardware ideosyncracies.
2011-03-26 15:55:47 -07:00
Michael Niedermayer
27ef7b1bcd Merge remote-tracking branch 'newdev/master'
* newdev/master:
  mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
  Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
  Use audio_service_type to set stream disposition.
  Add APIchanges entry for audio_service_type.
  Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
  configure: in check_ld, place new -l flags before existing ones
  support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
  doc: update build system documentation
  aacenc: indentation
  aacenc: fix the side calculation in search_for_ms
  vp8.c: rename EDGE_* to VP8_EDGE_*.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vp8.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-26 03:06:30 +01:00
Mans Rullgard
7e75f9fe5e configure: in check_ld, place new -l flags before existing ones
This fixes some library tests when --as-needed is in effect.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-25 19:36:32 +00:00
Stefano Sabatini
10a7831aa1 configure: sort filter deps entries 2011-03-25 18:49:24 +01:00
Stefano Sabatini
63ec0aa888 configure: update ffmpeg-user mailing-list address
The address recently changed from ffmpeg-user@mplayerhq.hu to
ffmpeg-user@ffmpeg.org.
2011-03-25 18:47:22 +01:00
Michael Niedermayer
797ef671dd Merge remote-tracking branch 'newdev/master'
* newdev/master:
  matroskadec: set default duration for simple block
  When building for MinGW32 disable strict ANSI compliancy.
  ARM: fix ff_apply_window_int16_neon() prototype
  configure: check for --as-needed support early
  ARM: NEON optimised apply_window_int16()
  ac3enc: NEON optimised shift functions
  ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min
  mpeg12.c: fix slice threading for mpeg2 field picture mode.
  ffmetadec.c: fix compiler warnings.
  configure: Don't explicitly disable ffplay or in/outdevices on dos
  configure: Remove the explicit disabling of ffserver
  configure: Add fork as a dependency to ffserver

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-25 02:57:41 +01:00
Diego Elio Pettenò
5666a9f20c When building for MinGW32 disable strict ANSI compliancy.
When -std=c99 is used, GCC defines __STRICT_ANSI__ to hide non-ANSI
interfaces; on MinGW32, when this macro is defined, some functions that are
part of POSIX but not of Windows APIs are disabled, including strcasecmp().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-24 23:45:55 +01:00
Mans Rullgard
4a7e068b8f configure: check for --as-needed support early
This moves the check for --as-needed linker support before all
library tests, ensuring consistent behaviour between the checks
and the actual link step.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-24 20:42:22 +00:00
Martin Storsjö
da21225ae2 configure: Don't explicitly disable ffplay or in/outdevices on dos
The normal dependency tracking system disables them just fine.
2011-03-24 09:20:05 +01:00
Martin Storsjö
8bb605c11f configure: Remove the explicit disabling of ffserver
It is automatically disabled on both mingw and dos due to
the lack of fork.
2011-03-24 09:02:59 +01:00
Martin Storsjö
1ff49c2314 configure: Add fork as a dependency to ffserver 2011-03-24 08:57:06 +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
Mans Rullgard
91bcad1971 Disable 'attribute "foo" ignored' warnings from icc
ICC lies about the version of gcc it emulates, which results
in unsupported attributes sometimes being used.  The warning
is an annoyance and should be disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-23 12:38:37 +00:00
Mans Rullgard
b9d2f4a956 configure: get libavcodec version from new version.h header
This fixes shared library versioning after 3dd851c.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-23 09:59:44 +00:00
Michael Niedermayer
4fa0e24736 Merge remote-tracking branch 'newdev/master'
* newdev/master: (33 commits)
  Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
  Add kbdwin.o to AC3 decoder
  Detect byte-swapped AC-3 and support decoding it directly.
  cosmetics: indentation
  Always copy input data for AC3 decoder.
  ac3enc: make sym_quant() branch-free
  cosmetics: indentation
  Add a CPU flag for the Atom processor.
  id3v2: skip broken tags with invalid size
  id3v2: don't explicitly skip padding
  Make sure kbhit() is in conio.h
  fate: update wmv8-drm reference
  vc1: make P-frame deblock filter bit-exact.
  configure: Add the -D parameter to the dlltool command
  amr: Set the AVFMT_GENERIC_INDEX flag
  amr: Set the pkt->pos field properly to the start of the packet
  amr: Set the codec->bit_rate field based on the last packet
  rtsp: Specify unicast for TCP interleaved streams, too
  Set the correct target for mingw64 dlltool
  applehttp: Change the variable for stream position in seconds into int64_t
  ...

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/ac3dec.c
	libavformat/avio.h
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-23 02:42:56 +01:00
Martin Storsjö
15c5156d24 configure: Set the correct lib target for arm/wince dlltool
The correct machine name for dlltool is arm-wince.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-23 01:23:21 +01:00
Dave Yeo
b58b9fa3b5 Make sure kbhit() is in conio.h
Conio.h is a non-standard header and may not have kbhit()
prototyped. This fixes compile on OS/2 where the EMX version (we're
using a fork) of conio.h only has getch() and getche().

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-22 11:07:46 +00:00
Martin Storsjö
77e41e047d configure: Add the -D parameter to the dlltool command
This is required for the generated .lib file to actually
be usable by MSVC.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-21 22:02:55 +01:00
Luca Barbato
417516f63f Set the correct target for mingw64 dlltool
That fixes .lib creation for the win64 target.
2011-03-21 20:22:51 +01:00
Michael Niedermayer
d4a50a2100 Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21 03:33:28 +01:00
Panagiotis H.M. Issaris
cb48e245e6 Do no modify terminal parameters using termios.h
Remove usage of tcgetattr and tcsetattr to modify terminal
parameters, and rely on ctrl-c to stop instead of pressing 'q'.
On systems with conio.h, keep the old behavior.

Changing the terminal settings causes problems if multiple instances
are running asynchronously on the same terminal, such as during a
parallel FATE run, or if the process crashes before restoring the
terminal.  In both cases, the terminal state is messed up requiring
a manual reset.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-20 21:13:26 +00:00
Mans Rullgard
4538729afe Move sine windows to a separate file
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-20 13:25:19 +00:00
Mans Rullgard
849f80fecb configure: use pkg-config helpers
This makes existing pkg-config uses as well as the libsdl checks
use the new pkg-config helper functions, which should be more
robust against broken systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-19 20:06:17 +01:00
Mans Rullgard
5d117bd462 configure: improve pkg-config support
This adds helper functions for checking packages with pkg-config
and managing the associated flags.

Note that pkg-config use is still discouraged due to widespread
poor practices resulting in broken flags in many situations.  A
few badly designed packages require flags only obtainable using
pkg-config, and these functions are intended for those cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3f8040db3e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-19 20:06:13 +01:00
Mans Rullgard
05aa8c4441 configure: allow checking multiple functions in check_func_headers()
This makes it possible to pass a space-separated list of functions
to check_func_headers and check_lib2.  If any function is missing,
none are enabled as available, so this should only be used for
all-or-nothing sets, i.e. groups in which none will be used if any
one is missing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit edaf1ae276)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-19 20:06:09 +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
Luca Barbato
ec10a9ab46 configure: use dlltools instead of lib.exe
This way building ffmpeg on mingw won't require windows specific tools
2011-03-19 16:39:54 +01:00
Luca Barbato
8f1b06c81c configure: check for SDL_Linked_Version instead of SDL_Init
This avoids the main/SDL_main declaration clash caused by SDL on
Windows and other platforms.
2011-03-19 16:39:54 +01:00
Mans Rullgard
42cfb3835b Remove Sonic experimental audio codec
Since initially committed in 2004, this codec has only been touched
for maintenanance.  Functionally, it contains no novel ideas and
its intended audience is better served by existing mature codecs.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 15:24:31 +00:00
Konstantin Pavlov
fda299f0d0 configure: use -r option for pr when listing enabled config options.
This fixes ugliness when configure outputs its (empty) results on HPUX
(maybe some other UNIXes too):

Enabled indevs:
pr:  -- empty file

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-18 12:13:40 +00:00
Michael Niedermayer
c0b1bc8d17 Revert "partially rename FFmpeg to Libav"
This reverts commit 070c5d0f35.
2011-03-17 17:26:45 +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
Michael Niedermayer
0cb88628fb Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
This reverts commit a03be6e1ba.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master'
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00
Sean McGovern
dff68563d8 darwin: use -read_only_relocs flag only on 32-bit x86
Avoids the linker warning:
ld: warning: -read_only_relocs cannot be used with x86_64

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-16 23:18:27 +00:00
Janne Grunau
a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +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
Janne Grunau
070c5d0f35 partially rename FFmpeg to Libav
update mailing list references and irc channels in configure
2011-03-16 21:54:39 +01:00
Michael Niedermayer
fbe98aee20 Revert "configure: allow checking multiple functions in check_func_headers()"
This reverts commit edaf1ae276.

breaks windows builds
2011-03-12 19:14:55 +01:00
Michael Niedermayer
8876c8ae24 Revert "configure: improve pkg-config support"
This reverts commit 3f8040db3e.

breaks windows builds
2011-03-12 19:14:49 +01:00
Michael Niedermayer
a0a1b7b90d Revert "configure: use pkg-config helpers"
This reverts commit 4fa18c5666.

breaks windows builds
2011-03-12 19:14:25 +01:00
Michael Niedermayer
27efa296c2 Merge branch 'master' of git://git.ffmpeg.org/ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-12 17:55:59 +01:00
Mans Rullgard
a5444fee06 Add CONFIG_AC3DSP symbol to simplify makefiles
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-12 11:35:26 +00:00
Mans Rullgard
4fa18c5666 configure: use pkg-config helpers
This makes existing pkg-config uses as well as the libsdl checks
use the new pkg-config helper functions, which should be more
robust against broken systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-11 20:13:32 +00:00
Mans Rullgard
3f8040db3e configure: improve pkg-config support
This adds helper functions for checking packages with pkg-config
and managing the associated flags.

Note that pkg-config use is still discouraged due to widespread
poor practices resulting in broken flags in many situations.  A
few badly designed packages require flags only obtainable using
pkg-config, and these functions are intended for those cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-11 20:13:26 +00:00
Mans Rullgard
edaf1ae276 configure: allow checking multiple functions in check_func_headers()
This makes it possible to pass a space-separated list of functions
to check_func_headers and check_lib2.  If any function is missing,
none are enabled as available, so this should only be used for
all-or-nothing sets, i.e. groups in which none will be used if any
one is missing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-11 20:13:22 +00:00
Philip Langdale
b33fa8a1cd CrystalHD decoder support v7
The Broadcom CrystalHD decoder chips provide hardware video
decoding for a number of video formats. It does so using a
memory:memory interface where a compressed bitstream is fed
in and decompressed pictures are copied out. As such, it works
independent of any graphics hardware in the system.

Features supported in this initial version:
* Support for Linux (using current drivers/library from git.wilsonet.com)
* Support for 70015 hardware
* Formats: MPEG2, MPEG4 Part 2, H.264, VC1 and DivX 3.11 (untested)
* Progressive content
* Non-H.264 Interlaced content
* H.264 MBAFF content

Features missing in this initial version:
* Support for OSX (might work - untested)
* Support for Windows
* Support for 70012 hardware
* H.264 PAFF content

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-10 20:17:19 +01:00
Stefano Sabatini
1a204f0760 framebuffer device demuxer 2011-03-08 17:33:23 +01:00
Mans Rullgard
42ccd2fcf8 Use --sysroot flag for clang
Although not documented, clang does support the --sysroot flag, and it
does the right thing.  Use this flag intead of -isysroot which only
applies to header file searches, not the linker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 00ba041cb3)
2011-03-01 13:55:54 +01:00
Mans Rullgard
00ba041cb3 Use --sysroot flag for clang
Although not documented, clang does support the --sysroot flag, and it
does the right thing.  Use this flag intead of -isysroot which only
applies to header file searches, not the linker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-28 02:55:50 +00:00
Reimar Döffinger
bbd289aa18 configure: document FATE_SAMPLES env var in --help text
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 52b3cc6047)
2011-02-28 00:34:38 +01:00
Mans Rullgard
1a9fc2b93b fate: get samples location from env var if not explicitly set
Use the FATE_SAMPLES environment variable if samples location
is not set with the --samples configure option or on the make
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa3805a486)
2011-02-28 00:34:38 +01:00
Reimar Döffinger
52b3cc6047 configure: document FATE_SAMPLES env var in --help text
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-26 12:52:13 +00:00
Mans Rullgard
aa3805a486 fate: get samples location from env var if not explicitly set
Use the FATE_SAMPLES environment variable if samples location
is not set with the --samples configure option or on the make
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-26 11:51:55 +00:00
Dave Yeo
f183cfeb99 OS/2: lxlite should use stdout
This causes lxlite to use stdout instead of vioXXX
functions. This improves fate and build logs readability.
Affects OS/2 only.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit cc4e9d2a24)
2011-02-26 03:16:06 +01:00
Dave Yeo
cc4e9d2a24 OS/2: lxlite should use stdout
This causes lxlite to use stdout instead of vioXXX
functions. This improves fate and build logs readability.
Affects OS/2 only.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-25 19:48:19 +00:00
Stefano Sabatini
bd8e750300 Port drawtext filter by Hemanth from the libavfilter soc repo, with
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:45 +01:00
Mans Rullgard
cdeba2de82 x86: check for AVX support
This adds configure and runtime checks for AVX support on x86 CPUs.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 87f1355f9b)
2011-02-20 19:05:47 +01:00
Mans Rullgard
87f1355f9b x86: check for AVX support
This adds configure and runtime checks for AVX support on x86 CPUs.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-20 13:20:42 +00:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01: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
Mans Rullgard
e0099fdaac configure: fix non-standard regex used with expr
The colon operator of expr always anchors the pattern at the start
of the string.  An explicit ^ in the pattern has unspecified
behaviour, so remove it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3ad464bfc7)
2011-02-14 23:58:20 +01:00
Mans Rullgard
48e0556739 configure: report full gcc version string
This makes the cc_ident value, which is used in FATE reports, include
all interesting parts of the gcc version string.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5d57846bba)
2011-02-14 23:58:20 +01:00
Mans Rullgard
8429368d22 configure: add cleanws() function
This function removes leading and trailing spaces and collapses
multiple spaces into one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bb7a22b584)
2011-02-14 23:58:19 +01:00
Mans Rullgard
3ad464bfc7 configure: fix non-standard regex used with expr
The colon operator of expr always anchors the pattern at the start
of the string.  An explicit ^ in the pattern has unspecified
behaviour, so remove it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 21:00:03 +00:00
Mans Rullgard
5d57846bba configure: report full gcc version string
This makes the cc_ident value, which is used in FATE reports, include
all interesting parts of the gcc version string.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 16:22:14 +00:00
Mans Rullgard
bb7a22b584 configure: add cleanws() function
This function removes leading and trailing spaces and collapses
multiple spaces into one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 16:22:14 +00:00
Mans Rullgard
3ae4484cdf configure: remove early check_deps $ARCH_EXT_LIST
The early disabling of irrelevant arch extensions is no longer
required, and removing it makes dependencies involving these
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4b884207eb)
2011-02-13 00:52:51 +01:00
Mans Rullgard
4b884207eb configure: remove early check_deps $ARCH_EXT_LIST
The early disabling of irrelevant arch extensions is no longer
required, and removing it makes dependencies involving these
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 18:45:21 +00:00
François Revol
68b2336d13 Fix HOSTLIBS on Haiku
Haiku does not have a separate libm, so do not try to link to it.

Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f59c4bd625)
2011-02-09 03:33:55 +01:00
Anssi Hannula
5fb06ffac7 configure: check yasm/nasm for working pextrd opcode
NASM versions older than 2.08 fail to build ffmpeg with several
"error: operation size not specified" errors but this is not caught in
configure.

Fix that by checking if "pextrd [eax], xmm0, 1" works in configure.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 48545a8f72)
2011-02-09 03:30:01 +01:00
François Revol
f59c4bd625 Fix HOSTLIBS on Haiku
Haiku does not have a separate libm, so do not try to link to it.

Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-08 21:16:02 +00:00
Anssi Hannula
48545a8f72 configure: check yasm/nasm for working pextrd opcode
NASM versions older than 2.08 fail to build ffmpeg with several
"error: operation size not specified" errors but this is not caught in
configure.

Fix that by checking if "pextrd [eax], xmm0, 1" works in configure.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-06 11:43:35 -05:00
Mans Rullgard
9873463c2f Enable native build on QNX/x86
(cherry picked from commit d33ed7b367)
2011-01-31 18:25:40 +01:00
Mans Rullgard
d33ed7b367 Enable native build on QNX/x86 2011-01-30 01:05:39 +00:00
Mans Rullgard
744c166422 armcc: filter out non-gcc options from ASFLAGS
This allows passing armcc-specific flags with --extra-cflags without
choking the assembler.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d0f0f6287c)
2011-01-26 03:43:31 +01:00
Mans Rullgard
9c5c348eef configure: add filter_out() function
This adds a function to filter out words matching a pattern
from a list.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9d201b2606)
2011-01-26 03:43:31 +01:00
Daniel Verkamp
121053b2d6 configure: move network tests before results are needed
This moves network_extralibs setup before use so that the link tests
for network functions work correctly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 54fe299b88)
2011-01-26 03:43:30 +01:00
Mans Rullgard
a98ffb2bc8 Add CFLAGS needed by PathScale compiler
The PathScale compiler miscompiles wrapping arithmetic without
these flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5f3b8314a4)
2011-01-26 03:43:28 +01:00
Mans Rullgard
355d05280a Disable symbol versioning on some BSDs
Dragonfly, NetBSD, and OpenBSD do not support symbol versioning
although our link test passes.  Disable it explicitly for these
systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a1e4b3f6d3)
2011-01-26 03:43:28 +01:00
Mans Rullgard
d0f0f6287c armcc: filter out non-gcc options from ASFLAGS
This allows passing armcc-specific flags with --extra-cflags without
choking the assembler.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 20:32:08 +00:00
Mans Rullgard
9d201b2606 configure: add filter_out() function
This adds a function to filter out words matching a pattern
from a list.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 20:32:08 +00:00
Daniel Verkamp
54fe299b88 configure: move network tests before results are needed
This moves network_extralibs setup before use so that the link tests
for network functions work correctly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 13:42:15 +00:00
Mans Rullgard
5f3b8314a4 Add CFLAGS needed by PathScale compiler
The PathScale compiler miscompiles wrapping arithmetic without
these flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-24 01:59:15 +00:00
Mans Rullgard
a1e4b3f6d3 Disable symbol versioning on some BSDs
Dragonfly, NetBSD, and OpenBSD do not support symbol versioning
although our link test passes.  Disable it explicitly for these
systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-23 21:33:31 +00:00
Mans Rullgard
c7892b418b Fix libavformat version extraction in configure
This fixes shared library builds broken by
50196a982b

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4ad66441c9)
2011-01-23 19:32:07 +01:00
Mans Rullgard
727a20cb60 configure: better test for mktemp
Some variants of mktemp require a template, so provide one when
checking for the command.  We already supply a template in the
subsequent uses of mktemp.

Thanks to Michael Kostylev.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a210bce298)
2011-01-23 19:32:06 +01:00
Mans Rullgard
3df0297567 configure: simplify exit traps
This does the same thing and also fixes the trapping in
some (possibly broken) shells.

Suggested by Michael Kostylev.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 93bb9ff08e)
2011-01-23 19:32:06 +01:00
Michael Niedermayer
002bd34603 Fix out of source tree builds of libmpcodecs. 2011-01-23 16:58:32 +01:00
Mans Rullgard
4ad66441c9 Fix libavformat version extraction in configure
This fixes shared library builds broken by
50196a982b

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 21:51:06 +00:00
Mans Rullgard
a210bce298 configure: better test for mktemp
Some variants of mktemp require a template, so provide one when
checking for the command.  We already supply a template in the
subsequent uses of mktemp.

Thanks to Michael Kostylev.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 20:54:03 +00:00
Mans Rullgard
93bb9ff08e configure: simplify exit traps
This does the same thing and also fixes the trapping in
some (possibly broken) shells.

Suggested by Michael Kostylev.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 20:47:58 +00:00
Mans Rullgard
a091006d3d Make demuxers auto-select parsers they need
This makes configure --disable-everything --enable-demuxer=foo
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit c2dd0e9eba)
2011-01-21 20:36:01 +01:00
Mans Rullgard
bb71141450 Make PNG test depend on PNG codec
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f0f54c297f)
2011-01-21 20:36:00 +01:00
Mans Rullgard
ef44b5bf19 configure: fix mktemp test and fallback function
(cherry picked from commit 09a5c2452c)
2011-01-21 20:35:45 +01:00
Mans Rullgard
c2dd0e9eba Make demuxers auto-select parsers they need
This makes configure --disable-everything --enable-demuxer=foo
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 18:36:13 +00:00
Michael Niedermayer
3b63a52207 Add GPL dependancy for libmpcodecs 2011-01-21 14:12:09 +01:00
Mans Rullgard
f0f54c297f Make PNG test depend on PNG codec
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-20 18:01:03 +00:00
Mans Rullgard
09a5c2452c configure: fix mktemp test and fallback function 2011-01-18 22:17:10 +00:00
Mans Rullgard
44caaa560b ARM: improve VFP ABI check
Recent gcc versions define __ARM_PCS or __ARM_PCS_VFP to indicate the
VFP ABI in use, and ARM RVCT defines __SOFTFP__ when using this ABI.
If none of these are defined, check $cross_prefix and $cc for the
substring "hardfloat", and finally fall back to a linker test.  This
gives the correct result in most configurations.
2011-01-18 20:48:25 +00:00
Mans Rullgard
b0c1b66a4b armcc: suppress warning about hardfp compatibility 2011-01-18 20:48:25 +00:00
Mans Rullgard
5a92140b6e armcc: suppress 'assignment in condition' warning 2011-01-18 20:48:24 +00:00
Mans Rullgard
ef4a65149d Replace ASMALIGN() with .p2align
This macro has unconditionally used .p2align for a long time and
serves no useful purpose.
2011-01-18 20:48:24 +00:00
Mans Rullgard
fb3c4ffc4b configure: make $TMPE executable
This is required on systems where the linker does not change
the permissions of an existing output file.
2011-01-18 20:48:24 +00:00
Mans Rullgard
fef2d66166 Use -Bsymbolic for shared libs only, not executables
Some linkers fail if this flag is used when creating an executable file.
Since the flag is meaningful only for shared libraries, dropping it from
the main link flags is correct.
2011-01-18 20:48:24 +00:00
Lou Logan
4a6a21f5e4 Change SVN to Git in configure
Changes "version from SVN" to "version from Git".

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 22:13:22 +01:00
Daniel Verkamp
73f6d31e6c Win32 support for av_file_map()
Originally committed as revision 26221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 05:16:33 +00:00
Stefano Sabatini
44b2784fb4 Remove unnecessary dependency of ffprobe and ffserver on libswscale.
Originally committed as revision 26213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-04 14:00:10 +00:00
Justin Ruggles
6fd96d1a85 Change the AC-3 encoder to use floating-point.
Fixed-point AC-3 encoder renamed to ac3_fixed.
Regression test acodec-ac3 renamed to acodec-ac3_fixed.
Regression test lavf-rm changed to use ac3_fixed encoder.

Originally committed as revision 26209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-04 11:53:44 +00:00
Carl Eugen Hoyos
ba76378393 libavfilter does not depend on libswscale, only the scale filter does.
Originally committed as revision 26203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-03 10:56:37 +00:00
Carl Eugen Hoyos
6734f2c89e "Fix" compilation with --disable-swscale.
Originally committed as revision 26200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-02 16:24:19 +00:00
Stefano Sabatini
b567020943 Add copy filter, useful for testing the avfilter_draw_slice() copy
code.

Originally committed as revision 26112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 01:01:09 +00:00
Stefano Sabatini
cf69ad35c5 Redesign the libopencv wrapper to make it more generic. Accept both
FILTERNAME=ARGS and FILTERNAME:ARGS syntax.

The same filter class will be used for managing all the libopencv
filtering functions.

Originally committed as revision 26079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-23 17:24:19 +00:00
Stefano Sabatini
0328b9ea39 Add av_file_map() and av_file_unmap() functions.
Originally committed as revision 26073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-22 14:13:04 +00:00
Ronald S. Bultje
2b2a597ec0 AMR-WB decoder, written as part of Google Summer of Code 2010 by Marcelo
Galvão Póvoa <marspeoplester gmail com>, mentored by Robert Swain <robert
dot swain gmail com>.

Originally committed as revision 26051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 03:03:18 +00:00
Martin Storsjö
4f7d2fe2e3 configure: Avoid warnings if av_always_inline is disabled
This macro is disabled if --enable-small or --disable-optimizations are set.
Currently, this leads to warnings about functions being defined but not used,
for functions in header files.

By defining av_always_inline as inline or as av_unused, we avoid these
warnings.

This doesn't make a normal build with --enable-small any larger,
since the compiler probably chooses not to inline these functions even
if they're marked as inline.

Originally committed as revision 26032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-16 08:41:17 +00:00
Martin Storsjö
9baec618c0 configure: Allow disabling symbol versioning via --disable-symver
Originally committed as revision 25944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-14 08:34:57 +00:00
Michael Chinen
475ae04a27 Add a FLAC parser.
Seek test reference updated because FLAC seeking now works properly.
Fixes roundup issue 1150.

Patch by Michael Chinen [mchinen at gmail]

Originally committed as revision 25914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 14:50:50 +00:00
Baptiste Coudurier
a4dc7aa5b5 Port libmpcodecs hqdn3d filter.
Patch by Baptiste with some fixes by me.

Originally committed as revision 25880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-04 13:03:42 +00:00
Stefano Sabatini
a42bb9d624 Add missing dependencies for frei0r_src in configure.
Originally committed as revision 25857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-30 21:41:26 +00:00
Carl Eugen Hoyos
f1c7c6aee8 Silence icc warning about unsupported option -Wno-parentheses
Originally committed as revision 25670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 10:38:39 +00:00
Janne Grunau
136e19e1cf Add single stream LATM/LOAS decoder
The decoder is just a wrapper around the AAC decoder.
based on patch by Paul Kendall { paul <ät> kcbbs gen nz }

Originally committed as revision 25642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-02 08:32:04 +00:00
Jason Garrett-Glaser
5dd9752076 Bump required x264 version to X264_BUILD 99
Required after r25567.

Originally committed as revision 25576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-26 18:19:22 +00:00
Martin Storsjö
44b70ce563 rtsp: Untangle the dependencies between the RTSP/SDP demuxers and RTSP muxer
This allows compilation of one of them without requiring the others'
dependencies to be present.

Originally committed as revision 25535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-21 12:18:48 +00:00
Martin Storsjö
44594cc798 Add a demuxer for receiving raw rtp:// URLs without an SDP description
The demuxer inspects the payload type of a received RTP packet and
handles the cases where the content is fully described by the payload type.

Originally committed as revision 25527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-19 07:38:53 +00:00
Martin Storsjö
01c8d258da Add a SAP demuxer
Originally committed as revision 25463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 09:06:59 +00:00
Stefano Sabatini
68b79bfc48 Implement cropdetect filter.
Originally committed as revision 25447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-12 09:22:32 +00:00
Martin Storsjö
2aab70c476 sapenc: Declare a dependency on rtp_protocol, too
The SAP muxer uses network functions directly, uses the rtp protocol and the
udp protocol. The network functions and the udp protocol are both transitively
enabled via the rtp protocol, so that's the only dependency that needs to
be stated.

Originally committed as revision 25423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 09:29:29 +00:00
Martin Storsjö
fcc7f40449 sapenc: Mark the muxer as depending on network functions
Hide all code mentioning IPv6 behind HAVE_STRUCT_SOCKADDR_IN6.

Originally committed as revision 25415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 17:48:13 +00:00
Martin Storsjö
011071e717 Add a SAP (Session Announcement Protocol, RFC 2974) muxer
Originally committed as revision 25413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 12:05:04 +00:00
Rafaël Carré
9b9d3868d5 libmp3lame: don't check unused function in detection
hip_decode_init() isn't used by the wrapper, and can be absent from the
library if lame was configured with --disable-decoder (like it is done
for windows builds of VLC)

Unfortunately this also removes the way to detect a libmp3lame more recent
than the buggy 3.98.2

Patch by Rafaël Carré, rafael carre at gmail

Originally committed as revision 25391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 08:38:39 +00:00
Martin Storsjö
3ece3e4c56 Add RTP depacketization of the X-QT QuickTime format
Originally committed as revision 25371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-06 12:42:18 +00:00