Commit Graph

31119 Commits

Author SHA1 Message Date
Reimar Döffinger
ebc64dc818 Revert "build: Remove multiple inclusion guards from config.mak."
This reverts commit 89b5829d0a.

Conflicts:

	configure
2011-06-26 09:50:18 +02:00
Reimar Döffinger
1109680434 Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."
This reverts commit a6213f3dce.
2011-06-26 09:49:36 +02:00
Reimar Döffinger
b3ca11f07f Revert "build: Add DEP_LIBS dependency directly to the shared library build rule."
This reverts commit 729f953fb5.
2011-06-26 09:42:42 +02:00
Michael Niedermayer
4ccb7911ba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: silence some annoying armcc warnings
  ffplay: Remove unused-but-set channels variable from update_sample_display().
  build: Add DEP_LIBS dependency directly to the shared library build rule.
  build: Remove multiple inclusion guards from config.mak.
  build: Remove redundant config.mak includes from subdirectory Makefiles.
  aacenc: Mark psy_3gpp_window() as av_unused.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-26 02:31:32 +02:00
Stefano Sabatini
5fba761f6e samplefmt: remove deprecated use of av_get_bits_per_sample_fmt()
Use av_get_bytes_per_sample() instead.

Fix deprecation warning:
samplefmt.c: In function ‘av_samples_fill_arrays’:
samplefmt.c:88: warning: ‘av_get_bits_per_sample_fmt’ is deprecated (declared at samplefmt.c:76)
2011-06-25 22:06:30 +02:00
Stefano Sabatini
5aca97e247 vsink_buffer: add missing description 2011-06-25 22:06:30 +02:00
Stefano Sabatini
d7686b3e0f configure: select buffersink_filter when ffplay is enabled
buffersink_filter is a strong requirement for compiling ffplay.
Fixes ffplay compilation with --disable-everything --disable-ffmpeg.
2011-06-25 22:06:30 +02:00
Mans Rullgard
d0ce090ec5 ARM: silence some annoying armcc warnings
This silences warnings about pointer target sign mismatches as
already done for gcc with -Wno-pointer-sign.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-25 19:02:56 +01:00
Reimar Döffinger
c5cf0f7a76 Fix compilation in subdir with NASM.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-06-25 19:15:39 +02: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
Diego Biurrun
c713620b4c ffplay: Remove unused-but-set channels variable from update_sample_display(). 2011-06-25 14:11:33 +02:00
Diego Biurrun
729f953fb5 build: Add DEP_LIBS dependency directly to the shared library build rule.
The dependency was added conditional to a variable that is always defined,
so it is safe to add it directly.
2011-06-25 13:02:51 +02:00
Diego Biurrun
89b5829d0a build: Remove multiple inclusion guards from config.mak.
config.mak is no longer included multiple times; the guards are pointless.
2011-06-25 13:02:51 +02:00
Diego Biurrun
a6213f3dce build: Remove redundant config.mak includes from subdirectory Makefiles.
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
2011-06-25 13:02:51 +02:00
Diego Biurrun
3a0d0ff5e6 aacenc: Mark psy_3gpp_window() as av_unused.
It is intentionally left in to allow adding 3GPP-style windowing in the future.
Marking it av_unused silences an annoying unused function warning.
2011-06-25 11:39:36 +02:00
Nicolas George
392aa6e444 ogg_read_packet: forward error code. 2011-06-25 11:03:23 +02:00
Michael Niedermayer
dca3542d35 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  configure: Add -Wno-format-zero-length to CFLAGS.
  udp: Receive on the remote port number, if no local port is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-25 04:32:49 +02:00
Stefano Sabatini
e65d6e22e3 configure: select buffersink_filter when ffmpeg is enabled
buffersink_filter is a strong requirement for compiling ffmpeg.
Fixes ffmpeg compilation with --disable-everything.
2011-06-24 23:48:50 +02:00
Diego Biurrun
b36518dcf4 configure: Add -Wno-format-zero-length to CFLAGS.
The C standard specifies that zero-length format strings are allowed.
2011-06-24 21:16:10 +02:00
Reimar Döffinger
5aa8b270db Restore accidentally removed parts of "BRIEF" list.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-06-24 20:26:08 +02:00
Jeff Downs
f6d28cf029 parse_options(): Avoid passing NULL as a string arg to fprintf 2011-06-24 13:04:51 -04:00
Can Wu
fc66e23154 udp: Receive on the remote port number, if no local port is set
For a unicast udp stream to localhost:1234, currently
ffplay udp://:1234?localport=1234
works, but
ffplay udp://:1234
doesn't work.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-24 18:27:02 +03:00
Stefano Sabatini
f925b24381 general.texi: clarify with examples what "the FFmpeg libraries" means 2011-06-24 11:56:19 +02:00
Stefano Sabatini
978e711b2c general.texi: remove reference to --enable-memalign-hack, no longer required 2011-06-24 11:53:20 +02:00
Stefano Sabatini
470ac1437d MAINTAINERS: add a "Releases" section
The new section documents the maintainership status for the various
FFmpeg releases, on a best effort basis.
2011-06-24 11:15:26 +02:00
Stefano Sabatini
9fff623d0a Changelog: merge various 0.7* sections into a single 0.8 section
FFmpeg never had distinct alfa/beta 0.7 releases, so having a single
0.8 section with all the changes should be less confusing for the
users, and it is also consistent with what we did with 0.5 and 0.6
releases.

Also add a dedicated 0.7 section, explaining how it differs from 0.8.
2011-06-24 11:15:19 +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
Diego Biurrun
adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-24 00:37:49 +02:00
Martin Storsjö
9abbe8cc13 Use av_printf_format to check the usage of printf style functions
This helps catching cases where the format string doesn't
match what is passed in, or injection bugs where user data
is passed in as format string.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-23 20:17:46 +03:00
Martin Storsjö
67e9ae14d9 Add av_printf_format, for marking printf style format strings and their parameters
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-06-23 20:17:44 +03:00
Mans Rullgard
9e19704a6a ARM: enable thumb for Cortex-M* CPUs
These CPUs are thumb-only and thus require this option.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 16:55:36 +01:00
Anton Khirnov
ffc6c8a430 Support u8, s8, alaw and mulaw channel reordering in alsa. 2011-06-23 16:50:28 +02:00
Diego Biurrun
35fa0d4758 nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
This eliminates a warning about a set-but-unused variable.
2011-06-23 13:47:16 +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
Stefano Sabatini
41b68dce4d lavdev: improve feedback in case of invalid frame rate/size
Show the invalid string in the error message.

While at it also prefer "Could not" over "Couldn't", plain forms are
preferred over contractions (simplify readability, especially for non
English-savvy people).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:49 +02:00
Stefano Sabatini
a4bda40544 vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
The variable is used for containing the parsed value of framerate,
using a lexically consistent name eases readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:49 +02:00
Stefano Sabatini
e60068baeb v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
The variable is used for containing the parsed value of framerate,
using a lexically consistent name eases readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:49 +02:00
Stefano Sabatini
a5351720cc fbdev: prefer "framerate_q" over "fps" in device context
The variable is used for containing the parsed value of framerate,
using a lexically consistent name eases readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:49 +02:00
Stefano Sabatini
da51a7c69c bktr: prefer "framerate" over "fps" for grab_read_header()
The variable is used for containing the parsed value of s1->framerate,
using a lexically consistent name ease readability/understanding.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:48 +02:00
Nicolas George
147bcf27c4 ALSA: implement channel layout for playback.
Currently quad, 5.0, 5.1 and 7.1 are implemented.
Implementing support for other formats/layouts and capture should be
straightforward.

5.0 and 7.1 support by Carl Eugen Hoyos.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:48 +02:00
Carl Eugen Hoyos
2359aeb52d alsa: support unsigned variants of already supported signed formats. 2011-06-23 08:49:48 +02:00
Carl Eugen Hoyos
921715edff alsa: add support for more formats.
Specifically, f32, f64, s32, s24, a-law and mu-law.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-23 08:49:48 +02:00
Mans Rullgard
8986fddc2b ARM: allow building in Thumb2 mode
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 07:31:54 +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
Stefano Sabatini
1af1b52772 general.texi: use "the FFmpeg libraries" in place of enumerating them
Avoid an incomplete listing of the libav* libraries, and the need to
update them again.
2011-06-23 01:30:37 +02:00
Stefano Sabatini
72365be496 general.texi: apply minor formatting fix in the MinGW section 2011-06-23 01:30:37 +02:00