]> git.sesse.net Git - ffmpeg/log
ffmpeg
13 years agoFix linesize for some rawvideo samples with odd width.
Carl Eugen Hoyos [Thu, 30 Jun 2011 07:02:14 +0000 (09:02 +0200)]
Fix linesize for some rawvideo samples with odd width.

13 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 30 Jun 2011 02:20:53 +0000 (04:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rational-test: Add proper main() declaration to fix gcc warnings.
  configure: Add vdpau and dxva2 to configure results output.
  Remove unused, never built libavutil/pca.[ch]
  matroskadec: forward parsing errors to caller.
  av_find_stream_info: simplify EAGAIN handling.
  aacenc: Fix determination of Mid/Side Mode.
  psymodel: Remove the single channel analysis function
  aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel.
  psymodel: Add channels and channel groups to the psymodel.
  ARM: remove check for PLD instruction
  fate: move amr[nw]b test rules into separate files
  ogg: fix double free when finding length of small chained oggs.
  swscale: implement >8bit scaling support.
  build: fix creation of tools dir with make 3.81
  build: Mark all-yes Makefile target as phony.
  pixfmt: fix YUV422/444 wrong endian comment
  build: create output directories as needed
  Add new yuv444 pixfmts to avcodec_align_dimensions2

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years agoavcodec: increase padding, fixes ticket313
Michael Niedermayer [Wed, 29 Jun 2011 18:02:08 +0000 (20:02 +0200)]
avcodec: increase padding, fixes ticket313

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years agorational-test: Add proper main() declaration to fix gcc warnings.
Diego Biurrun [Sun, 26 Jun 2011 22:29:32 +0000 (00:29 +0200)]
rational-test: Add proper main() declaration to fix gcc warnings.

13 years agoconfigure: Add vdpau and dxva2 to configure results output.
Diego Biurrun [Wed, 8 Jun 2011 17:43:45 +0000 (19:43 +0200)]
configure: Add vdpau and dxva2 to configure results output.

13 years agoRemove unused, never built libavutil/pca.[ch]
Mans Rullgard [Wed, 29 Jun 2011 22:38:05 +0000 (23:38 +0100)]
Remove unused, never built libavutil/pca.[ch]

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agomatroskadec: forward parsing errors to caller.
Ami Fischman [Wed, 29 Jun 2011 20:54:49 +0000 (13:54 -0700)]
matroskadec: forward parsing errors to caller.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoav_find_stream_info: simplify EAGAIN handling.
Ami Fischman [Wed, 29 Jun 2011 20:50:21 +0000 (13:50 -0700)]
av_find_stream_info: simplify EAGAIN handling.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years agoMove SRC_PATH hack around to allow compilation from subdir again.
Reimar Döffinger [Wed, 29 Jun 2011 22:01:14 +0000 (00:01 +0200)]
Move SRC_PATH hack around to allow compilation from subdir again.

13 years agoSet channel_layout if channels is set when transcoding.
Carl Eugen Hoyos [Wed, 29 Jun 2011 21:49:44 +0000 (23:49 +0200)]
Set channel_layout if channels is set when transcoding.

13 years agoaacenc: Fix determination of Mid/Side Mode.
Nathan Caldwell [Wed, 29 Jun 2011 03:11:39 +0000 (21:11 -0600)]
aacenc: Fix determination of Mid/Side Mode.

In adjust_frame_information(), msc is incremented for each sfb in each
sub-window then compared against max_sfb which is for a single sub-window.

This resulted in frames using EIGHT_SHORT_SEQUENCE where the first few
sub-windows increment msc to a value that results in ms_mode == 2. Even
though only some of the bands are actually using Mid/Side.

13 years agopsymodel: Remove the single channel analysis function
Nathan Caldwell [Thu, 19 May 2011 05:23:22 +0000 (23:23 -0600)]
psymodel: Remove the single channel analysis function

13 years agoaacenc: Implement dummy channel group analysis that just calls the single channel...
Nathan Caldwell [Thu, 19 May 2011 05:14:59 +0000 (23:14 -0600)]
aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel.

13 years agopsymodel: Add channels and channel groups to the psymodel.
Nathan Caldwell [Wed, 15 Jun 2011 08:50:25 +0000 (02:50 -0600)]
psymodel: Add channels and channel groups to the psymodel.

13 years agoARM: remove check for PLD instruction
Mans Rullgard [Wed, 29 Jun 2011 19:59:24 +0000 (20:59 +0100)]
ARM: remove check for PLD instruction

PLD is present in ARMv5TE and later, which is checked for separately.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agofate: move amr[nw]b test rules into separate files
Mans Rullgard [Wed, 29 Jun 2011 18:01:25 +0000 (19:01 +0100)]
fate: move amr[nw]b test rules into separate files

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoogg: fix double free when finding length of small chained oggs.
Ronald S. Bultje [Wed, 29 Jun 2011 05:24:21 +0000 (22:24 -0700)]
ogg: fix double free when finding length of small chained oggs.

ogg_save() copies streams[], but doesn't keep track of free()'ed
struct members. Thus, if in between a call to ogg_save() and
ogg_restore(), streams[].private was free()'ed, this would result
in a double free -> crash, which happened when e.g. playing small
chained ogg fragments.

13 years agoswscale: implement >8bit scaling support.
Ronald S. Bultje [Wed, 29 Jun 2011 16:39:43 +0000 (09:39 -0700)]
swscale: implement >8bit scaling support.

This means that precision is retained when scaling between sample
formats with >8 bits per component (48bit RGB, 16bit grayscale,
9/10/16bit YUV).

13 years agobuild: fix creation of tools dir with make 3.81
Mans Rullgard [Wed, 29 Jun 2011 10:46:08 +0000 (11:46 +0100)]
build: fix creation of tools dir with make 3.81

GNU make 3.81 apparently does not support order-only prerequisites
with pattern rules, and thus fails to create the tools directory
if it is missing.  Naming the objects explicitly in the rule makes
it work properly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agobuild: Mark all-yes Makefile target as phony.
Diego Biurrun [Tue, 7 Jun 2011 11:16:48 +0000 (13:16 +0200)]
build: Mark all-yes Makefile target as phony.

13 years agopixfmt: fix YUV422/444 wrong endian comment
Can Wu [Wed, 29 Jun 2011 01:37:57 +0000 (09:37 +0800)]
pixfmt: fix YUV422/444 wrong endian comment

Signed-off-by: Diego Biurrun <diego@biurrun.de>
13 years agobuild: create output directories as needed
Mans Rullgard [Tue, 28 Jun 2011 17:45:13 +0000 (18:45 +0100)]
build: create output directories as needed

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years agoRemove gcc 2.95.3 remnants.
Carl Eugen Hoyos [Wed, 29 Jun 2011 08:07:39 +0000 (10:07 +0200)]
Remove gcc 2.95.3 remnants.

13 years agoAdd new yuv444 pixfmts to avcodec_align_dimensions2
Jason Garrett-Glaser [Wed, 29 Jun 2011 01:22:23 +0000 (18:22 -0700)]
Add new yuv444 pixfmts to avcodec_align_dimensions2

Fixes draw_edges crashes with high-bit-depth 4:4:4 decoding.

13 years agoswscale: Fix yuv422p10
Michael Niedermayer [Wed, 29 Jun 2011 03:56:46 +0000 (05:56 +0200)]
swscale: Fix yuv422p10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 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>
13 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.

13 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>
13 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>
13 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>
13 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>
13 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.

13 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.

13 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>
13 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>
13 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>
13 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>
13 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.

13 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>
13 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

13 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>
13 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).

13 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.

13 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.

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

13 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.

13 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.

13 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.

13 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>
13 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>
13 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.

13 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.

13 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.

13 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.

13 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>
13 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.

13 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.

13 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()

13 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.

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

13 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.

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

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

13 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.

13 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>
13 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>
13 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>
13 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().

13 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.

13 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

13 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.

13 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.

13 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]

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

13 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>
13 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.

13 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>
13 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

13 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.

13 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.

13 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>
13 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)

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

13 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.

13 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>
13 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>
13 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>
13 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().

13 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.

13 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.

13 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.

13 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.

13 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.

13 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>
13 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.

13 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.

13 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>
13 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

13 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>
13 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