OSDN Git Service
Ronald S. Bultje [Fri, 8 Jul 2011 21:52:52 +0000 (14:52 -0700)]
swscale: fix 16-bit scaling when output is 8-bits.
We would use the second half of the U plane buffer, rather than the
V plane buffer, to output the V plane pixels.
Michael Niedermayer [Sun, 3 Jul 2011 00:46:54 +0000 (02:46 +0200)]
sws: fix non native endian 9-15 bit input with 16bit out
Michael Niedermayer [Sun, 3 Jul 2011 00:34:00 +0000 (02:34 +0200)]
sws: disable scale16 when int32 is used
Michael Niedermayer [Sun, 3 Jul 2011 00:08:45 +0000 (02:08 +0200)]
sws: fix rgb -> 16bit
Michael Niedermayer [Sat, 2 Jul 2011 23:04:51 +0000 (01:04 +0200)]
sws: fix uv overwrite in 32bt
Michael Niedermayer [Sat, 2 Jul 2011 22:33:23 +0000 (00:33 +0200)]
sws: fix gray16_1
Michael Niedermayer [Sat, 2 Jul 2011 21:30:14 +0000 (23:30 +0200)]
sws:ix yuv2rgb48_1_c_template()
Michael Niedermayer [Sat, 2 Jul 2011 00:25:02 +0000 (02:25 +0200)]
sws: fix 16/32 bug from merge
Ronald S. Bultje [Fri, 1 Jul 2011 00:35:13 +0000 (17:35 -0700)]
swscale: for >8bit scaling, read in native bit-depth.
For 9/10bit, it means we don't have to upscale to 16bit before
actual scaling or pixel format conversion, and thus a performance
gain.
Michael Niedermayer [Fri, 1 Jul 2011 03:28:13 +0000 (05:28 +0200)]
Merge branch 'ronalds_buggy_gt8bit_sws'
* ronalds_buggy_gt8bit_sws:
swscale: fix another yuv range conversion overflow in 16bit scaling. (cherry picked from commit
81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
swscale: fix yuv range correction when using 16-bit scaling. (cherry picked from commit
e0b8fff6c7a293e35079ba1931bd19372686b3f6)
swscale: implement >8bit scaling support.
Conflicts:
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>
Ronald S. Bultje [Thu, 30 Jun 2011 14:05:52 +0000 (07:05 -0700)]
swscale: fix another yuv range conversion overflow in 16bit scaling.
(cherry picked from commit
81cc7d0bd1eab0aa782ff8dd49e087025a42cdee)
Ronald S. Bultje [Thu, 30 Jun 2011 04:04:45 +0000 (21:04 -0700)]
swscale: fix yuv range correction when using 16-bit scaling.
(cherry picked from commit
e0b8fff6c7a293e35079ba1931bd19372686b3f6)
Michael Niedermayer [Fri, 1 Jul 2011 00:51:10 +0000 (02:51 +0200)]
Fix mpeg4 padding bug detection with more than 128bit trash and slices.
Fixes ticket302
The second hunk is from anatoly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 1 Jul 2011 00:38:28 +0000 (02:38 +0200)]
Fix possible double free when encoding using xvid.
Carl Eugen Hoyos [Fri, 1 Jul 2011 00:34:33 +0000 (02:34 +0200)]
Fix internal buffer size for 2bpp and 4bpp raw video.
Jeff Downs [Wed, 29 Jun 2011 16:38:46 +0000 (12:38 -0400)]
Make all option parsing functions match the function pointer type through which they are called.
All option parsing functions now match the function pointer signature through
which they are called (int f(const char *, const char *), thereby working
reliably on all platforms.
Prefix all option processing functions with opt_
Stefano Sabatini [Thu, 30 Jun 2011 09:09:13 +0000 (11:09 +0200)]
lavu: bump minor and add APIchanges entry for AV_PICTURE_TYPE_NONE
The symbols was added in the git commit
512933671409f9f88cc9fdfc8f29525d32240bab.
Carl Eugen Hoyos [Thu, 30 Jun 2011 07:02:14 +0000 (09:02 +0200)]
Fix linesize for some rawvideo samples with odd width.
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).
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>
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>
Diego Biurrun [Sun, 26 Jun 2011 22:29:32 +0000 (00:29 +0200)]
rational-test: Add proper main() declaration to fix gcc warnings.
Diego Biurrun [Wed, 8 Jun 2011 17:43:45 +0000 (19:43 +0200)]
configure: Add vdpau and dxva2 to configure results output.
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>
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>
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>
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.
Carl Eugen Hoyos [Wed, 29 Jun 2011 21:49:44 +0000 (23:49 +0200)]
Set channel_layout if channels is set when transcoding.
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.
Nathan Caldwell [Thu, 19 May 2011 05:23:22 +0000 (23:23 -0600)]
psymodel: Remove the single channel analysis function
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.
Nathan Caldwell [Wed, 15 Jun 2011 08:50:25 +0000 (02:50 -0600)]
psymodel: Add channels and channel groups to the psymodel.
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>
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>
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.
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).
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>
Diego Biurrun [Tue, 7 Jun 2011 11:16:48 +0000 (13:16 +0200)]
build: Mark all-yes Makefile target as phony.
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>
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>
Carl Eugen Hoyos [Wed, 29 Jun 2011 08:07:39 +0000 (10:07 +0200)]
Remove gcc 2.95.3 remnants.
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.
Michael Niedermayer [Wed, 29 Jun 2011 03:56:46 +0000 (05:56 +0200)]
swscale: Fix yuv422p10
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
Ronald S. Bultje [Tue, 28 Jun 2011 19:32:40 +0000 (21:32 +0200)]
swscale: Add Doxygen for hyscale_fast/hScale.
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>
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>
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>
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>
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.
Ronald S. Bultje [Tue, 28 Jun 2011 17:42:17 +0000 (19:42 +0200)]
swscale: Add Doxygen for yuv2planar*/yuv2packed* functions.
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>
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>
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>
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>
Ronald S. Bultje [Tue, 28 Jun 2011 03:49:12 +0000 (20:49 -0700)]
swscale: update big endian reference values after
dff5a835.
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>
Justin Ruggles [Thu, 23 Jun 2011 18:26:34 +0000 (14:26 -0400)]
cosmetics: remove outdated comment that is no longer true
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>
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).
Diego Biurrun [Sun, 26 Jun 2011 22:42:55 +0000 (00:42 +0200)]
avutil: Remove unused arbitrary precision integer code.
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.
Stefano Sabatini [Tue, 28 Jun 2011 08:35:30 +0000 (10:35 +0200)]
dict: fix various typos
Nathan Caldwell [Mon, 20 Jun 2011 04:29:37 +0000 (22:29 -0600)]
aacenc: Save channel configuration for later use.
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.
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.
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>
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>
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.
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.
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.
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.
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>
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.
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.
Justin Ruggles [Mon, 27 Jun 2011 11:46:27 +0000 (07:46 -0400)]
ac3enc: merge log2_tab() into normalize_samples()
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.
Jonathan Baldwin [Sat, 25 Jun 2011 06:06:00 +0000 (08:06 +0200)]
lavdev: add openal input device
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.
ami_stuff [Mon, 27 Jun 2011 08:03:21 +0000 (10:03 +0200)]
Support fourcc Y8 (ticket 308).
ami_stuff [Mon, 27 Jun 2011 07:40:53 +0000 (09:40 +0200)]
Support fourcc YV16 (ticket 307).
Carl Eugen Hoyos [Mon, 27 Jun 2011 07:26:48 +0000 (09:26 +0200)]
Fix VDPAU decoding for some H264 samples.
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>
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>
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>
Ronald S. Bultje [Sun, 26 Jun 2011 21:41:44 +0000 (14:41 -0700)]
swscale: remove unused xInc/srcW arguments from hScale().
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.
Jason Garrett-Glaser [Sun, 26 Jun 2011 02:40:05 +0000 (19:40 -0700)]
H.264: make filter_mb_fast support 4:4:4
Baptiste Coudurier [Sun, 26 Jun 2011 21:08:22 +0000 (14:08 -0700)]
dnxhddec: handle cid change in bitstream.
Baptiste Coudurier [Sun, 26 Jun 2011 21:01:00 +0000 (14:01 -0700)]
ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
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]
Stefano Sabatini [Sat, 18 Jun 2011 01:11:16 +0000 (03:11 +0200)]
lavfi: add testsrc source
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>
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.
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>
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
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.
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.
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>
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)