ffmpeg.git
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 29 Jun 2011 02:08:31 +0000 (04:08 +0200)]
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>
7 years agoswscale: Add Doxygen for hyscale_fast/hScale.
Ronald S. Bultje [Tue, 28 Jun 2011 19:32:40 +0000 (21:32 +0200)]
swscale: Add Doxygen for hyscale_fast/hScale.

7 years agofate: enable lavfi-pixmt tests on big endian systems
Mans Rullgard [Tue, 28 Jun 2011 21:37:42 +0000 (22:37 +0100)]
fate: enable lavfi-pixmt tests on big endian systems

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoPPC: swscale: disable altivec functions for unsupported formats
Mans Rullgard [Tue, 28 Jun 2011 22:19:36 +0000 (23:19 +0100)]
PPC: swscale: disable altivec functions for unsupported formats

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoamrnbdec: we dont want dtx samples anymore and give the user a hint towards how to...
Michael Niedermayer [Tue, 28 Jun 2011 20:23:52 +0000 (22:23 +0200)]
amrnbdec: we dont want dtx samples anymore and give the user a hint towards how to play such files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: merge identical pixdesc_be/le tests
Mans Rullgard [Tue, 28 Jun 2011 20:24:35 +0000 (21:24 +0100)]
fate: merge identical pixdesc_be/le tests

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoFix configure problem with out-of-source-tree build for fate-related .mak files in...
Paul Sterne [Sun, 26 Jun 2011 19:55:53 +0000 (12:55 -0700)]
Fix configure problem with out-of-source-tree build for fate-related .mak files in the tests and tests/fate subdirectories

This patch will add to the list of files for which configure creates
symbolic links when building outside of the ffmpeg source tree.
This fixes a problem for fate-related .mak files in the tests and tests/fate
subdirectories.

7 years agoswscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
Ronald S. Bultje [Tue, 28 Jun 2011 17:42:17 +0000 (19:42 +0200)]
swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.

7 years agobuild: call texi2pod.pl with full path instead of symlink
Mans Rullgard [Tue, 28 Jun 2011 16:12:36 +0000 (17:12 +0100)]
build: call texi2pod.pl with full path instead of symlink

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agobuild: include sub-makefiles using full path instead of symlinks
Mans Rullgard [Tue, 28 Jun 2011 16:08:00 +0000 (17:08 +0100)]
build: include sub-makefiles using full path instead of symlinks

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agotarga: Do not read colormap from files without one.
Reimar Döffinger [Mon, 27 Jun 2011 17:15:46 +0000 (19:15 +0200)]
targa: Do not read colormap from files without one.

This is necessary because some programs writing TGA files forget
to initialize parts of the header they don't care about, resulting
in "random" data there.
The new behaviour is consistent with other programs, e.g. tgatoppm.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agotarga: Simplify using bytestream_get functions.
Reimar Döffinger [Mon, 27 Jun 2011 17:05:49 +0000 (19:05 +0200)]
targa: Simplify using bytestream_get functions.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoswscale: update big endian reference values after dff5a835.
Ronald S. Bultje [Tue, 28 Jun 2011 03:49:12 +0000 (20:49 -0700)]
swscale: update big endian reference values after dff5a835.

7 years agowavpack: skip blocks with no samples
Kostya Shishkov [Tue, 28 Jun 2011 09:49:32 +0000 (11:49 +0200)]
wavpack: skip blocks with no samples

These blocks don't report audio stream parameters and they are not needed
for decoding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agocosmetics: remove outdated comment that is no longer true
Justin Ruggles [Thu, 23 Jun 2011 18:26:34 +0000 (14:26 -0400)]
cosmetics: remove outdated comment that is no longer true

7 years agobuild: replace some addprefix/addsuffix with substitution refs
Mans Rullgard [Tue, 28 Jun 2011 13:45:57 +0000 (14:45 +0100)]
build: replace some addprefix/addsuffix with substitution refs

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agopict_type: add a value for unknown/none.
Martin Matuska [Tue, 28 Jun 2011 11:26:56 +0000 (13:26 +0200)]
pict_type: add a value for unknown/none.

In commit bebe72f4a05d338e04ae9ca1e9c6b72749b488aa, the enum AV_PICTURE_TYPE_* was introduced. There are still places in the code where pict_type is used as an integer and there is a case where "pict_type = 0" with the explanation "let ffmpeg decide what to do". The new enum does not know a value of 0 and C++ will fail if compiling such programs anyway as it is refered as an int (and you cannot patch them properly).

7 years agoavutil: Remove unused arbitrary precision integer code.
Diego Biurrun [Sun, 26 Jun 2011 22:42:55 +0000 (00:42 +0200)]
avutil: Remove unused arbitrary precision integer code.

7 years agoconfigure: Drop check for availability of ten assembler operands.
Diego Biurrun [Wed, 22 Jun 2011 21:30:15 +0000 (23:30 +0200)]
configure: Drop check for availability of ten assembler operands.

This was done to support gcc 2.95, which is an old legacy compiler
that fails to compile the current codebase anyway.

7 years agodict: fix various typos
Stefano Sabatini [Tue, 28 Jun 2011 08:35:30 +0000 (10:35 +0200)]
dict: fix various typos

7 years agoaacenc: Save channel configuration for later use.
Nathan Caldwell [Mon, 20 Jun 2011 04:29:37 +0000 (22:29 -0600)]
aacenc: Save channel configuration for later use.

7 years agoaacenc: Fix codebook trellising for zeroed bands.
Alex Converse [Wed, 22 Jun 2011 06:12:42 +0000 (23:12 -0700)]
aacenc: Fix codebook trellising for zeroed bands.

Choose band type (codebook) zero, count its bits, and mark the other
states as unnavigable.

7 years agoswscale: change prototypes of scaled YUV output functions.
Ronald S. Bultje [Thu, 16 Jun 2011 16:04:26 +0000 (12:04 -0400)]
swscale: change prototypes of scaled YUV output functions.

Remove unused variables "flags" and "dstFormat" in yuv2packed1,
merge source rows per plane for yuv2packed[12], and make every
source argument int16_t (some where invalidly set to uint16_t).
This prevents stack pollution and is part of the Great Evil Plan
to simplify swscale.

7 years agorandom_seed: more elaborate doxy.
Michael Niedermayer [Tue, 28 Jun 2011 02:23:20 +0000 (04:23 +0200)]
random_seed: more elaborate doxy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAVDictionary: warn about its shortcommings and mention available replacements.
Michael Niedermayer [Tue, 28 Jun 2011 02:10:40 +0000 (04:10 +0200)]
AVDictionary: warn about its shortcommings and mention available replacements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: re-add support for non-native endianness.
Ronald S. Bultje [Fri, 24 Jun 2011 14:43:19 +0000 (07:43 -0700)]
swscale: re-add support for non-native endianness.

This works through some non-obvious hacks in utils.c.

7 years agoswscale: disentangle yuv2rgbX_c_full() into small functions.
Ronald S. Bultje [Thu, 16 Jun 2011 16:04:25 +0000 (12:04 -0400)]
swscale: disentangle yuv2rgbX_c_full() into small functions.

This is part of the Great Evil Plan to simplify swscale.

7 years agoswscale: split yuv2packed[12X]_c() remainders into small functions.
Ronald Bultje [Tue, 28 Jun 2011 01:10:03 +0000 (18:10 -0700)]
swscale: split yuv2packed[12X]_c() remainders into small functions.

This is part of the Great Evil Plan to simplify swscale.

7 years agoswscale: split yuv2packedX_altivec in smaller functions.
Ronald S. Bultje [Thu, 16 Jun 2011 16:04:24 +0000 (12:04 -0400)]
swscale: split yuv2packedX_altivec in smaller functions.

This will likely lead to a considerable performance boost,
since it removes a branch from the inner loop. Part of the
Great Evil Plan to simplify swscale.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 28 Jun 2011 00:29:39 +0000 (02:29 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3enc: move ff_ac3_encode_frame() to ac3enc_template.c
  ac3enc: merge log2_tab() into normalize_samples()
  ac3enc: Remove bit allocation fallbacks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: don't use planar output functions to write to NV12/21.
Ronald S. Bultje [Sun, 26 Jun 2011 22:52:00 +0000 (15:52 -0700)]
swscale: don't use planar output functions to write to NV12/21.

This prevents a crash when converting to NV12/21 without the bitexact
flags enabled.

7 years agoac3enc: move ff_ac3_encode_frame() to ac3enc_template.c
Justin Ruggles [Mon, 27 Jun 2011 03:58:19 +0000 (23:58 -0400)]
ac3enc: move ff_ac3_encode_frame() to ac3enc_template.c

This avoids using function pointers for quite a few small functions, most of
which just call DSP functions.

7 years agoac3enc: merge log2_tab() into normalize_samples()
Justin Ruggles [Mon, 27 Jun 2011 11:46:27 +0000 (07:46 -0400)]
ac3enc: merge log2_tab() into normalize_samples()

7 years agoac3enc: Remove bit allocation fallbacks.
Justin Ruggles [Tue, 21 Jun 2011 16:59:11 +0000 (12:59 -0400)]
ac3enc: Remove bit allocation fallbacks.

They introduce too much complexity for very little benefit. The result is that
encoding will be more likely to fail at extremely low bitrates where quality
would be awful anyway.

7 years agolavdev: add openal input device
Jonathan Baldwin [Sat, 25 Jun 2011 06:06:00 +0000 (08:06 +0200)]
lavdev: add openal input device

7 years agovf_lut: fix draw_slice() in case of non packed image data for packed RGB
Stefano Sabatini [Sun, 26 Jun 2011 16:49:00 +0000 (18:49 +0200)]
vf_lut: fix draw_slice() in case of non packed image data for packed RGB

The previous code was erroneously assuming that the linesize was
equivalent to width*pixel_step, which is not always true.

7 years agoSupport fourcc Y8 (ticket 308).
ami_stuff [Mon, 27 Jun 2011 08:03:21 +0000 (10:03 +0200)]
Support fourcc Y8 (ticket 308).

7 years agoSupport fourcc YV16 (ticket 307).
ami_stuff [Mon, 27 Jun 2011 07:40:53 +0000 (09:40 +0200)]
Support fourcc YV16 (ticket 307).

7 years agoFix VDPAU decoding for some H264 samples.
Carl Eugen Hoyos [Mon, 27 Jun 2011 07:26:48 +0000 (09:26 +0200)]
Fix VDPAU decoding for some H264 samples.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 27 Jun 2011 01:32:45 +0000 (03:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: improve rules for test programs
  build: factor out the .c and .S compile commands as a macro
  swscale: remove unused xInc/srcW arguments from hScale().
  H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
  H.264: make filter_mb_fast support 4:4:4
  mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
  configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
  Move some variable declarations below the proper #ifdefs.

Conflicts:
Makefile
ffplay.c
libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: improve rules for test programs
Mans Rullgard [Sat, 25 Jun 2011 10:51:09 +0000 (11:51 +0100)]
build: improve rules for test programs

This generates dependencies for the *-test.o files ensuring
rebuilds when necessary.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agobuild: factor out the .c and .S compile commands as a macro
Mans Rullgard [Sat, 25 Jun 2011 10:57:32 +0000 (11:57 +0100)]
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>
8 years agoswscale: remove unused xInc/srcW arguments from hScale().
Ronald S. Bultje [Sun, 26 Jun 2011 21:41:44 +0000 (14:41 -0700)]
swscale: remove unused xInc/srcW arguments from hScale().

8 years agoH.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
Jason Garrett-Glaser [Sun, 26 Jun 2011 07:21:54 +0000 (00:21 -0700)]
H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit

2tap qpel isn't implemented yet for high bit depth, so it just breaks decoding.

8 years agoH.264: make filter_mb_fast support 4:4:4
Jason Garrett-Glaser [Sun, 26 Jun 2011 02:40:05 +0000 (19:40 -0700)]
H.264: make filter_mb_fast support 4:4:4

8 years agodnxhddec: handle cid change in bitstream.
Baptiste Coudurier [Sun, 26 Jun 2011 21:08:22 +0000 (14:08 -0700)]
dnxhddec: handle cid change in bitstream.

8 years agoffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
Baptiste Coudurier [Sun, 26 Jun 2011 21:01:00 +0000 (14:01 -0700)]
ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.

8 years agompeg4videoenc: Remove disabled variant of mpeg4_encode_block().
Diego Biurrun [Sun, 26 Jun 2011 14:37:07 +0000 (16:37 +0200)]
mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().

As a nice sideeffect this fixes the following warning:
libavcodec/mpeg4videoenc.c:302:20: warning: variable ‘rl’ set but not used [-Wunused-but-set-variable]

8 years agolavfi: add testsrc source
Stefano Sabatini [Sat, 18 Jun 2011 01:11:16 +0000 (03:11 +0200)]
lavfi: add testsrc source

8 years agoconfigure: allow post-fixed cpu strings for athlon64, k8, and opteron
Alexis Ballier [Wed, 22 Jun 2011 20:25:14 +0000 (22:25 +0200)]
configure: allow post-fixed cpu strings for athlon64, k8, and opteron
when setting the -march flag.

This is to match gcc's {athlon64,k8,opteron}-sse3 -march flags.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoMove some variable declarations below the proper #ifdefs.
Diego Biurrun [Tue, 14 Jun 2011 22:30:03 +0000 (00:30 +0200)]
Move some variable declarations below the proper #ifdefs.

This avoids warnings about set-but-unused variables.

8 years agoAdd operand size to add instructions.
Reimar Döffinger [Sun, 26 Jun 2011 11:29:17 +0000 (13:29 +0200)]
Add operand size to add instructions.

In these cases it can't be guessed from the operands (at least
not necessarily), and it seems some clang versions refuse to
compiler it.
Fixes ticket #303.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRevert "build: Remove multiple inclusion guards from config.mak."
Reimar Döffinger [Sun, 26 Jun 2011 07:44:31 +0000 (09:44 +0200)]
Revert "build: Remove multiple inclusion guards from config.mak."

This reverts commit 89b5829d0a4d9510efeff65dbeeaed50e0980120.

Conflicts:

configure

8 years agoRevert "build: Remove redundant config.mak includes from subdirectory Makefiles."
Reimar Döffinger [Sun, 26 Jun 2011 07:46:05 +0000 (09:46 +0200)]
Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."

This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.

8 years agoRevert "build: Add DEP_LIBS dependency directly to the shared library build rule."
Reimar Döffinger [Sun, 26 Jun 2011 07:42:42 +0000 (09:42 +0200)]
Revert "build: Add DEP_LIBS dependency directly to the shared library build rule."

This reverts commit 729f953fb5079ca09bbac391b824be454df029d6.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 26 Jun 2011 00:31:32 +0000 (02:31 +0200)]
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>
8 years agosamplefmt: remove deprecated use of av_get_bits_per_sample_fmt()
Stefano Sabatini [Sat, 25 Jun 2011 19:54:58 +0000 (21:54 +0200)]
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)

8 years agovsink_buffer: add missing description
Stefano Sabatini [Sat, 25 Jun 2011 19:53:21 +0000 (21:53 +0200)]
vsink_buffer: add missing description

8 years agoconfigure: select buffersink_filter when ffplay is enabled
Stefano Sabatini [Sat, 25 Jun 2011 19:49:45 +0000 (21:49 +0200)]
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.

8 years agoARM: silence some annoying armcc warnings
Mans Rullgard [Sat, 25 Jun 2011 17:51:00 +0000 (18:51 +0100)]
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>
8 years agoFix compilation in subdir with NASM.
Reimar Döffinger [Fri, 24 Jun 2011 08:04:22 +0000 (10:04 +0200)]
Fix compilation in subdir with NASM.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRestore some more rules to common.mak to improve building in subdirs.
Reimar Döffinger [Fri, 24 Jun 2011 17:53:28 +0000 (19:53 +0200)]
Restore some more rules to common.mak to improve building in subdirs.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoffplay: Remove unused-but-set channels variable from update_sample_display().
Diego Biurrun [Sat, 25 Jun 2011 12:09:40 +0000 (14:09 +0200)]
ffplay: Remove unused-but-set channels variable from update_sample_display().

8 years agobuild: Add DEP_LIBS dependency directly to the shared library build rule.
Diego Biurrun [Sat, 25 Jun 2011 00:01:12 +0000 (02:01 +0200)]
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.

8 years agobuild: Remove multiple inclusion guards from config.mak.
Diego Biurrun [Fri, 24 Jun 2011 22:32:12 +0000 (00:32 +0200)]
build: Remove multiple inclusion guards from config.mak.

config.mak is no longer included multiple times; the guards are pointless.

8 years agobuild: Remove redundant config.mak includes from subdirectory Makefiles.
Diego Biurrun [Fri, 24 Jun 2011 22:19:39 +0000 (00:19 +0200)]
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.

8 years agoaacenc: Mark psy_3gpp_window() as av_unused.
Diego Biurrun [Fri, 24 Jun 2011 08:49:59 +0000 (10:49 +0200)]
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.

8 years agoogg_read_packet: forward error code.
Nicolas George [Fri, 24 Jun 2011 10:02:41 +0000 (12:02 +0200)]
ogg_read_packet: forward error code.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 25 Jun 2011 02:04:53 +0000 (04:04 +0200)]
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>
8 years agoconfigure: select buffersink_filter when ffmpeg is enabled
Stefano Sabatini [Fri, 24 Jun 2011 21:45:15 +0000 (23:45 +0200)]
configure: select buffersink_filter when ffmpeg is enabled

buffersink_filter is a strong requirement for compiling ffmpeg.
Fixes ffmpeg compilation with --disable-everything.

8 years agoconfigure: Add -Wno-format-zero-length to CFLAGS.
Diego Biurrun [Fri, 24 Jun 2011 19:16:10 +0000 (21:16 +0200)]
configure: Add -Wno-format-zero-length to CFLAGS.

The C standard specifies that zero-length format strings are allowed.

8 years agoRestore accidentally removed parts of "BRIEF" list.
Reimar Döffinger [Fri, 24 Jun 2011 17:51:16 +0000 (19:51 +0200)]
Restore accidentally removed parts of "BRIEF" list.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoparse_options(): Avoid passing NULL as a string arg to fprintf
Jeff Downs [Thu, 23 Jun 2011 18:12:37 +0000 (14:12 -0400)]
parse_options(): Avoid passing NULL as a string arg to fprintf

8 years agoudp: Receive on the remote port number, if no local port is set
Can Wu [Fri, 17 Jun 2011 05:58:01 +0000 (13:58 +0800)]
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>
8 years agogeneral.texi: clarify with examples what "the FFmpeg libraries" means
Stefano Sabatini [Fri, 24 Jun 2011 09:56:19 +0000 (11:56 +0200)]
general.texi: clarify with examples what "the FFmpeg libraries" means

8 years agogeneral.texi: remove reference to --enable-memalign-hack, no longer required
Stefano Sabatini [Wed, 22 Jun 2011 23:36:29 +0000 (01:36 +0200)]
general.texi: remove reference to --enable-memalign-hack, no longer required

8 years agoMAINTAINERS: add a "Releases" section
Stefano Sabatini [Thu, 23 Jun 2011 22:06:56 +0000 (00:06 +0200)]
MAINTAINERS: add a "Releases" section

The new section documents the maintainership status for the various
FFmpeg releases, on a best effort basis.

8 years agoChangelog: merge various 0.7* sections into a single 0.8 section
Stefano Sabatini [Thu, 23 Jun 2011 21:52:33 +0000 (23:52 +0200)]
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.

8 years agoAllow running make in subdirs again.
Reimar Döffinger [Fri, 24 Jun 2011 07:10:25 +0000 (09:10 +0200)]
Allow running make in subdirs again.

8 years agoRevert "build: move basic rules and variables to main Makefile"
Reimar Döffinger [Fri, 24 Jun 2011 07:02:57 +0000 (09:02 +0200)]
Revert "build: move basic rules and variables to main Makefile"

This reverts commit bb5249244ddb22df1cfb8dee1c369e6cd653d00d.
This is necessary to allow running "make" in subdirs again.

Conflicts:

Makefile

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 24 Jun 2011 00:54:12 +0000 (02:54 +0200)]
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>
8 years agodoxygen: Consistently use '@' instead of '\' for Doxygen markup.
Diego Biurrun [Thu, 23 Jun 2011 20:41:54 +0000 (22:41 +0200)]
doxygen: Consistently use '@' instead of '\' for Doxygen markup.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoUse av_printf_format to check the usage of printf style functions
Martin Storsjö [Fri, 17 Jun 2011 07:31:11 +0000 (10:31 +0300)]
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>
8 years agoAdd av_printf_format, for marking printf style format strings and their parameters
Martin Storsjö [Fri, 17 Jun 2011 07:30:15 +0000 (10:30 +0300)]
Add av_printf_format, for marking printf style format strings and their parameters

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoARM: enable thumb for Cortex-M* CPUs
Mans Rullgard [Thu, 23 Jun 2011 14:42:19 +0000 (15:42 +0100)]
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>
8 years agoSupport u8, s8, alaw and mulaw channel reordering in alsa.
Anton Khirnov [Thu, 23 Jun 2011 14:49:51 +0000 (16:49 +0200)]
Support u8, s8, alaw and mulaw channel reordering in alsa.

8 years agonsvdec: Propagate error values instead of returning 0 in nsv_read_header().
Diego Biurrun [Thu, 23 Jun 2011 11:27:21 +0000 (13:27 +0200)]
nsvdec: Propagate error values instead of returning 0 in nsv_read_header().

This eliminates a warning about a set-but-unused variable.

8 years agobuild: remove SRC_PATH_BARE variable
Mans Rullgard [Mon, 6 Jun 2011 21:38:38 +0000 (22:38 +0100)]
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>
8 years agobuild: move basic rules and variables to main Makefile
Mans Rullgard [Sun, 5 Jun 2011 21:29:37 +0000 (22:29 +0100)]
build: move basic rules and variables to main Makefile

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agobuild: move special targets to end of main Makefile
Mans Rullgard [Mon, 6 Jun 2011 14:21:12 +0000 (15:21 +0100)]
build: move special targets to end of main Makefile

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavdev: improve feedback in case of invalid frame rate/size
Stefano Sabatini [Fri, 3 Jun 2011 08:50:28 +0000 (10:50 +0200)]
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>
8 years agovfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
Stefano Sabatini [Fri, 3 Jun 2011 08:41:47 +0000 (10:41 +0200)]
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>
8 years agov4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
Stefano Sabatini [Fri, 3 Jun 2011 08:39:54 +0000 (10:39 +0200)]
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>
8 years agofbdev: prefer "framerate_q" over "fps" in device context
Stefano Sabatini [Fri, 3 Jun 2011 08:31:42 +0000 (10:31 +0200)]
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>
8 years agobktr: prefer "framerate" over "fps" for grab_read_header()
Stefano Sabatini [Fri, 3 Jun 2011 08:54:10 +0000 (10:54 +0200)]
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>
8 years agoALSA: implement channel layout for playback.
Nicolas George [Thu, 10 Mar 2011 11:10:34 +0000 (12:10 +0100)]
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>
8 years agoalsa: support unsigned variants of already supported signed formats.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:04:18 +0000 (01:04 +0200)]
alsa: support unsigned variants of already supported signed formats.

8 years agoalsa: add support for more formats.
Carl Eugen Hoyos [Mon, 13 Jun 2011 19:16:30 +0000 (21:16 +0200)]
alsa: add support for more formats.

Specifically, f32, f64, s32, s24, a-law and mu-law.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoARM: allow building in Thumb2 mode
Mans Rullgard [Tue, 14 Jun 2011 10:29:48 +0000 (11:29 +0100)]
ARM: allow building in Thumb2 mode

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 23 Jun 2011 02:49:04 +0000 (04:49 +0200)]
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>