ffmpeg.git
8 years agofate: add GEN tag for mapchan sw tests.
Clément Bœsch [Fri, 13 Jan 2012 18:17:12 +0000 (19:17 +0100)]
fate: add GEN tag for mapchan sw tests.

8 years agofix av_dlog call with non-AVClass struct
Maksym Veremeyenko [Mon, 16 Jan 2012 14:20:58 +0000 (16:20 +0200)]
fix av_dlog call with non-AVClass struct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove extraneous newline from dpx reference which breaks FATE.
Reimar Döffinger [Mon, 16 Jan 2012 18:43:41 +0000 (19:43 +0100)]
Remove extraneous newline from dpx reference which breaks FATE.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRework VP8 decoder frame skipping code.
Reimar Döffinger [Sun, 11 Dec 2011 15:02:30 +0000 (16:02 +0100)]
Rework VP8 decoder frame skipping code.

This reworks the frame skipping code such that the reference
buffers are still updated according to the header.
However it also ensures that the current frame will not end
up in any reference buffer.
Also fixes a hang with frame-multithreading, probably because
get_buffer was already called and would have reset the progress,
however the frame could remain in framep due to the missing update
(or it could be assigned to next_framep and a skip_frame skip would
then write it into framep - there might be even more failure modes).
Sample might become available at samples/nsv/vp8.nsv

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agomxfdec: Add missing free.
Reimar Döffinger [Sun, 15 Jan 2012 09:08:02 +0000 (10:08 +0100)]
mxfdec: Add missing free.

Should fix valgrind FATE.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoasfdec: Move variable declarations into the blocks they are used in.
Reimar Döffinger [Sun, 15 Jan 2012 19:18:22 +0000 (20:18 +0100)]
asfdec: Move variable declarations into the blocks they are used in.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agolavu: add 2.1 channel layout.
Clément Bœsch [Wed, 11 Jan 2012 09:09:37 +0000 (10:09 +0100)]
lavu: add 2.1 channel layout.

8 years agoAdd dpx encoding regression test.
Carl Eugen Hoyos [Mon, 16 Jan 2012 11:57:39 +0000 (12:57 +0100)]
Add dpx encoding regression test.

8 years agoSupport rgb64 dpx encoding.
Carl Eugen Hoyos [Mon, 16 Jan 2012 09:59:27 +0000 (10:59 +0100)]
Support rgb64 dpx encoding.

8 years agoAdd gray16 and rgb48 png encoding regression tests.
Carl Eugen Hoyos [Mon, 16 Jan 2012 09:57:56 +0000 (10:57 +0100)]
Add gray16 and rgb48 png encoding regression tests.

8 years agoEnhance HLS seeking.
Panagiotis H.M. Issaris [Tue, 10 Jan 2012 13:48:57 +0000 (14:48 +0100)]
Enhance HLS seeking.

Enhances seeking by demuxing until the requested timestamp is reached within
the segment selected by the seek code using the playlist info.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovorbisdec: Check that the x values of floor1 are unique.
Michael Niedermayer [Thu, 12 Jan 2012 03:21:47 +0000 (04:21 +0100)]
vorbisdec: Check that the x values of floor1 are unique.

This is required by the spec and fixes video-1frag.ogg.48.ogg. (FPE)

Based on the debuging work of Oana Stratulat and ubitux.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: cosmetics - move a line to a better position and add a comment
Jean First [Sat, 14 Jan 2012 13:10:20 +0000 (14:10 +0100)]
mov: cosmetics - move a line to a better position and add a comment

mov: cosmetics - move a line to a better position and add a comment

Oana Andreea Stratulat submitted a similar patch to trac, but forgot
to notify the ML about it.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomovenc: add FIXME to add alis and rsrc atoms
Jean First [Sat, 14 Jan 2012 13:10:19 +0000 (14:10 +0100)]
movenc: add FIXME to add alis and rsrc atoms

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomovenc: indent cosemtics
Jean First [Sat, 14 Jan 2012 13:10:17 +0000 (14:10 +0100)]
movenc: indent cosemtics

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 16 Jan 2012 00:20:32 +0000 (01:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: split ADPCM and DPCM test references into separate files.
  mov, mxfdec: Employ more meaningful return values.
  lavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer()
  wavpack: fix clipping for 32-bit lossy mode
  vb: Use bytestream2 functions

Conflicts:
libavcodec/utils.c
libavcodec/vb.c
libavformat/mxfdec.c
tests/fate/dpcm.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport rgb48 and rgba64 png encoding.
Carl Eugen Hoyos [Sun, 15 Jan 2012 21:04:25 +0000 (22:04 +0100)]
Support rgb48 and rgba64 png encoding.

8 years agofate: split ADPCM and DPCM test references into separate files.
Diego Biurrun [Thu, 12 Jan 2012 23:58:22 +0000 (00:58 +0100)]
fate: split ADPCM and DPCM test references into separate files.

8 years agoSimplify RGB32 png encoding.
Carl Eugen Hoyos [Sun, 15 Jan 2012 21:00:11 +0000 (22:00 +0100)]
Simplify RGB32 png encoding.

8 years agomov, mxfdec: Employ more meaningful return values.
Daniel Huang [Sat, 14 Jan 2012 21:25:12 +0000 (15:25 -0600)]
mov, mxfdec: Employ more meaningful return values.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoSupport gray16 png encoding.
Carl Eugen Hoyos [Sun, 15 Jan 2012 20:57:02 +0000 (21:57 +0100)]
Support gray16 png encoding.

8 years agoSupport gray8a png encoding.
Carl Eugen Hoyos [Sun, 15 Jan 2012 20:53:01 +0000 (21:53 +0100)]
Support gray8a png encoding.

8 years agolavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer()
Reinhard Tartler [Sun, 15 Jan 2012 19:32:11 +0000 (20:32 +0100)]
lavc: Relax API strictness in avcodec_decode_audio3 with a custom get_buffer()

Do not fail audio decoding with avcodec_decode_audio3 if user has set a
custom get_buffer. Strictly speaking, this was never allowed by the API,
but it seems that some software packages did so anyways. In order to
unbreak applications (cf. http://bugs.debian.org/655890), this change
clarifies the API and overrides the custom get_buffer() with the defaults.

This change is inspired by a similar
commit (c3846e3ebab610be691adb8b40d376dc2f675dc4) in FFmpeg.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoFix ff_get_guid for short reads or errors.
Reimar Döffinger [Sun, 15 Jan 2012 15:58:21 +0000 (16:58 +0100)]
Fix ff_get_guid for short reads or errors.

Current code would just return uninitialized data with no way
to detect this condition.
Instead, fill the whole GUID with 0 in that case.
Fixes valgrind uninitialized data errors in fate-seek-lavf_asf.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agolavfi-showfiltfmts: fix typo that segfaulted haiku.
Michael Niedermayer [Sun, 15 Jan 2012 18:46:01 +0000 (19:46 +0100)]
lavfi-showfiltfmts: fix typo that segfaulted haiku.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agowavpack: fix clipping for 32-bit lossy mode
Kostya Shishkov [Sun, 15 Jan 2012 13:23:28 +0000 (14:23 +0100)]
wavpack: fix clipping for 32-bit lossy mode

Reference decoder clips data before shifting it to final range and also
forces 32-bit lossy mode to be actually 24-bit lossy mode in order to be
able to perform proper clipping.

8 years agoffplay: mark i variable in toggle_full_screen() as unused
Stefano Sabatini [Sun, 15 Jan 2012 12:27:45 +0000 (13:27 +0100)]
ffplay: mark i variable in toggle_full_screen() as unused

Fix gcc warning:
ffplay.c: In function ‘toggle_full_screen’:
ffplay.c:2792:9: warning: unused variable ‘i’ [-Wunused-variable]

8 years agolavfi/rgbtestsrc: make alpha plane opaque
Stefano Sabatini [Sun, 15 Jan 2012 12:03:15 +0000 (13:03 +0100)]
lavfi/rgbtestsrc: make alpha plane opaque

8 years agoiff: support masking plane feature
Peter Ross [Sun, 15 Jan 2012 08:34:45 +0000 (19:34 +1100)]
iff: support masking plane feature

Fixes ticket 705.

Reported-by: ami-stuff
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "buildsystem: add $EXESUF to the used tool for fate"
Michael Niedermayer [Sun, 15 Jan 2012 12:33:08 +0000 (13:33 +0100)]
Revert "buildsystem: add $EXESUF to the used tool for fate"

This reverts commit 668a74e808dad06b15549ed05aa3a879f76c17c3.
10l, this change was unneeded, target_exec can be used to achive the same.

8 years agoFix uninitialized reads for fate-vsynth1-asv2 test.
Reimar Döffinger [Sun, 15 Jan 2012 10:01:01 +0000 (11:01 +0100)]
Fix uninitialized reads for fate-vsynth1-asv2 test.

This is not a real error and memsetting always even when the
size did not change is overkill, but it still should be
an acceptable trade-off.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agooverlay: do not leak x/y expressions.
Nicolas George [Thu, 12 Jan 2012 18:18:13 +0000 (19:18 +0100)]
overlay: do not leak x/y expressions.

8 years agobuildsystem: add $EXESUF to the used tool for fate
Michael Niedermayer [Sun, 15 Jan 2012 06:14:08 +0000 (07:14 +0100)]
buildsystem: add $EXESUF to the used tool for fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovb: Use bytestream2 functions
Laurentiu Ion [Sat, 14 Jan 2012 19:04:59 +0000 (21:04 +0200)]
vb: Use bytestream2 functions

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoimgconvert: add PIX_FMT_GRAY8A to pix_fmt_info
Michael Niedermayer [Sun, 15 Jan 2012 01:40:18 +0000 (02:40 +0100)]
imgconvert: add PIX_FMT_GRAY8A to pix_fmt_info

Fixes selecting gray8a for PAM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 15 Jan 2012 00:07:00 +0000 (01:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sgidec: Use bytestream2 functions to prevent buffer overreads.
  cosmetics: Move static and inline attributes to more standard places.
  configure: provide libavfilter/version.h header to get_version()
  swscale: change yuv2yuvX code to use cpuflag().
  libx264: Don't leave max_b_frames as -1 if the user didn't set it
  FATE: convert output to rgba for the targa tests which currently output pal8
  fate: add missing reference files for targa tests in 9c2f9b0e2
  FATE: enable the 2 remaining targa conformance suite tests
  targa: add support for rgb555 palette
  FATE: fix targa tests on big-endian systems

Conflicts:
libavcodec/sgidec.c
libavcodec/targa.c
libswscale/x86/output.asm
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoljpegdec: reset restart interval for each plane of a non interleaved file.
Michael Niedermayer [Sat, 14 Jan 2012 22:44:50 +0000 (23:44 +0100)]
ljpegdec: reset restart interval for each plane of a non interleaved file.

Fixes Ticket907

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agothp: Fix handling of restart interval
Michael Niedermayer [Sat, 14 Jan 2012 22:30:01 +0000 (23:30 +0100)]
thp: Fix handling of restart interval

Fixes Ticket903

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix compilation without HAVE_AVX, HAVE_YASM etc.
Reimar Döffinger [Sat, 14 Jan 2012 16:09:07 +0000 (17:09 +0100)]
Fix compilation without HAVE_AVX, HAVE_YASM etc.

At the very least this should fix warnings about unused static
functions if one or more of these is not defined.
However even compilation might be broken if the compiler does
not optimize the function away completely.
This actually happens in case of the AVX function, since the
function pointer is used in an assignment that is not under
an #if and thus probably only optimized away after the function
was already marked as used.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agotimecode: fix typo
Jean First [Sat, 14 Jan 2012 13:10:18 +0000 (14:10 +0100)]
timecode: fix typo

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agox86/yuv2rgb_mmx: Remove yuv420 check.
Michael Niedermayer [Sat, 14 Jan 2012 20:42:56 +0000 (21:42 +0100)]
x86/yuv2rgb_mmx: Remove yuv420 check.

This check is not correct, the code supports more yuv variants.
Fixes Ticket904

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg12dec: BW10 support
Michael Niedermayer [Fri, 13 Jan 2012 04:56:59 +0000 (05:56 +0100)]
mpeg12dec: BW10 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg12dec: check uppercased codec_tag.
Michael Niedermayer [Sat, 14 Jan 2012 17:38:35 +0000 (18:38 +0100)]
mpeg12dec: check uppercased codec_tag.

We do this for all other codec_tag checks in mpegvideo*/h26*
doing it here too makes the code more consistent.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavidec: XMPG support
Michael Niedermayer [Fri, 13 Jan 2012 04:56:20 +0000 (05:56 +0100)]
avidec: XMPG support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosgidec: Use bytestream2 functions to prevent buffer overreads.
Aneesh Dogra [Fri, 13 Jan 2012 17:35:57 +0000 (23:05 +0530)]
sgidec: Use bytestream2 functions to prevent buffer overreads.

The patch also adds several bytestream macros to deal with native endian.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoUse correct register size, fixes compilation with NASM.
Reimar Döffinger [Sat, 14 Jan 2012 16:42:57 +0000 (17:42 +0100)]
Use correct register size, fixes compilation with NASM.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agocosmetics: Move static and inline attributes to more standard places.
Diego Biurrun [Fri, 13 Jan 2012 15:35:54 +0000 (16:35 +0100)]
cosmetics: Move static and inline attributes to more standard places.

Fixes several "‘static’ is not at beginning of declaration" warnings.

8 years agoFix leaking of side data.
Reimar Döffinger [Thu, 12 Jan 2012 20:31:11 +0000 (21:31 +0100)]
Fix leaking of side data.

While we correctly "register" the side data when we split it,
the application (in this case FFmpeg) might not update the
AVPacket pool it uses to finally free the packet, thus
causing a leak.
This also makes the av_dup_packet unnecessary which could
cause an even worse leak in this situation.
Also change the code to not modify the user-provide AVPacket at all.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoudp: fix segfault on closing
Laurent BRULET [Sat, 14 Jan 2012 16:14:18 +0000 (17:14 +0100)]
udp: fix segfault on closing

Fixes ticket915

8 years agoFATE: fix targa tests on big-endian systems
Justin Ruggles [Fri, 13 Jan 2012 21:14:48 +0000 (16:14 -0500)]
FATE: fix targa tests on big-endian systems

8 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 14 Jan 2012 15:40:49 +0000 (16:40 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: silence buffer size must be a multiple of frame size
  ffplay: use swr_set_compensation for audio synchronization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoc/bistream_filters.texi: add documentation for the h264_mp4toannexb filter
Stefano Sabatini [Thu, 12 Jan 2012 22:39:03 +0000 (23:39 +0100)]
doc/bistream_filters.texi: add documentation for the h264_mp4toannexb filter

8 years agoSupport transparency in iff images.
Carl Eugen Hoyos [Sat, 14 Jan 2012 09:38:42 +0000 (10:38 +0100)]
Support transparency in iff images.

Fixes ticket #707.

Reviewed-by: Peter Ross
8 years agoAdd CR/LF to a reget_buffer warning message.
Carl Eugen Hoyos [Sat, 14 Jan 2012 09:35:03 +0000 (10:35 +0100)]
Add CR/LF to a reget_buffer warning message.

8 years agoconfigure: provide libavfilter/version.h header to get_version()
Stefano Sabatini [Fri, 13 Jan 2012 15:23:55 +0000 (16:23 +0100)]
configure: provide libavfilter/version.h header to get_version()

Fix libavfilter library version numbers generation, which was broken in
3167dc9515810bbdd86d99d773bcf84657d2e72a.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoFixes issue 890: OOM with zmbv file
Oana Stratulat [Tue, 10 Jan 2012 22:01:09 +0000 (00:01 +0200)]
Fixes issue 890: OOM with zmbv file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoutils: check that parameters havnt changed in reget_buffer()
Michael Niedermayer [Wed, 11 Jan 2012 22:52:55 +0000 (23:52 +0100)]
utils: check that parameters havnt changed in reget_buffer()

Fixes Ticket902

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocabac_functions: fix license header, this wasnt developed in libav
Michael Niedermayer [Sat, 14 Jan 2012 03:51:13 +0000 (04:51 +0100)]
cabac_functions: fix license header, this wasnt developed in libav

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years ago1000l commit forgotten cabac fix
Michael Niedermayer [Sat, 14 Jan 2012 03:47:27 +0000 (04:47 +0100)]
1000l commit forgotten cabac fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 14 Jan 2012 01:22:09 +0000 (02:22 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add tests for targa
  ARM: fix Thumb-mode simple_idct_arm
  ARM: 4-byte align start of all asm functions
  rgb2rgb: rgb12to15()
  swscale-test: fix stack overread.
  swscale: fix invalid conversions and memory problems.
  cabac: split cabac.h into declarations and function definitions
  cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
  cabac: Remove ff_h264_lps_state array.

Conflicts:
libswscale/rgb2rgb.h
libswscale/swscale_unscaled.c
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: change yuv2yuvX code to use cpuflag().
Ronald S. Bultje [Fri, 13 Jan 2012 19:21:15 +0000 (11:21 -0800)]
swscale: change yuv2yuvX code to use cpuflag().

8 years agoRGBA64 encoding with libopenjpeg.
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:34:16 +0000 (01:34 +0100)]
RGBA64 encoding with libopenjpeg.

Reviewed-by: Michael Bradshaw
8 years agoGray16 encoding with libopenjpeg.
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:31:53 +0000 (01:31 +0100)]
Gray16 encoding with libopenjpeg.

Reviewed-by: Michael Bradshaw
8 years agoalacdec: support 32 bps
Baptiste Coudurier [Fri, 13 Jan 2012 00:06:20 +0000 (16:06 -0800)]
alacdec: support 32 bps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: Prevent opening of experimental codecs if strict_std_compliance > FF_COMPLIANCE...
Michael Niedermayer [Fri, 13 Jan 2012 05:29:51 +0000 (06:29 +0100)]
lavc: Prevent opening of experimental codecs if strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL.

Some of these encoders may produce invalid bitstreams, which should not
be done without the user knowing.
Some of these decoders may be unfinished and may contain security issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSupport reading 64bit dpx images.
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:15:42 +0000 (01:15 +0100)]
Support reading 64bit dpx images.

Reviewed-by: Jean First
8 years agoSupport reading 64bit sgi images.
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:14:51 +0000 (01:14 +0100)]
Support reading 64bit sgi images.

Reviewed-by: Jean First
8 years agoSupport 64bit pam encoding.
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:13:20 +0000 (01:13 +0100)]
Support 64bit pam encoding.

8 years agoSupport 64bit tiff images.
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:10:13 +0000 (01:10 +0100)]
Support 64bit tiff images.

Fixes a part of ticket #503.

Reviewed-by: Paul B Mahol
Reviewed-by: Jean First
8 years agolibx264: Don't leave max_b_frames as -1 if the user didn't set it
Martin Storsjö [Fri, 13 Jan 2012 21:41:16 +0000 (23:41 +0200)]
libx264: Don't leave max_b_frames as -1 if the user didn't set it

max_b_frames is initialized to -1 for libx264, to allow
distinguishing between an explicit user set 0 and a default not
touched 0 (see bb73cda2).

If max_b_frames is left as -1, this affects dts generation (where
expressions like max_b_frames != 0 are used), so make sure it is
left at the default 0 after the libx264 init function returns.

This avoids unnecessarily producing dts != pts when using
profile=baseline.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoIncrease maximum encoding video buffer size.
Carl Eugen Hoyos [Fri, 13 Jan 2012 23:59:02 +0000 (00:59 +0100)]
Increase maximum encoding video buffer size.

libavutil now supports 64bit RGB formats.

8 years agoSimplify 32bit RGB pam encoding.
Carl Eugen Hoyos [Fri, 13 Jan 2012 23:58:40 +0000 (00:58 +0100)]
Simplify 32bit RGB pam encoding.

Reviewed-by: Paul B Mahol
8 years agoFATE: convert output to rgba for the targa tests which currently output pal8
Justin Ruggles [Fri, 13 Jan 2012 23:40:12 +0000 (18:40 -0500)]
FATE: convert output to rgba for the targa tests which currently output pal8

fixes the tests on big-endian systems

8 years agofate: add missing reference files for targa tests in 9c2f9b0e2
Janne Grunau [Fri, 13 Jan 2012 22:52:59 +0000 (23:52 +0100)]
fate: add missing reference files for targa tests in 9c2f9b0e2

Fixes fate-targa-conformance-CCM8 and fate-targa-conformance-UCM8.

8 years agoFATE: enable the 2 remaining targa conformance suite tests
Justin Ruggles [Fri, 13 Jan 2012 21:41:15 +0000 (16:41 -0500)]
FATE: enable the 2 remaining targa conformance suite tests

8 years agotarga: add support for rgb555 palette
Justin Ruggles [Mon, 2 Jan 2012 20:17:12 +0000 (15:17 -0500)]
targa: add support for rgb555 palette

8 years agoFATE: fix targa tests on big-endian systems
Justin Ruggles [Fri, 13 Jan 2012 21:14:48 +0000 (16:14 -0500)]
FATE: fix targa tests on big-endian systems

8 years agoFATE: add tests for targa
Justin Ruggles [Thu, 12 Jan 2012 01:06:46 +0000 (20:06 -0500)]
FATE: add tests for targa

Based on a patch by Oana Stratulat <oanaandreeastratulat@gmail.com>

8 years agoARM: fix Thumb-mode simple_idct_arm
Mans Rullgard [Fri, 13 Jan 2012 19:03:14 +0000 (19:03 +0000)]
ARM: fix Thumb-mode simple_idct_arm

The alignment directive must obviously precede the label.
This was never noticed in ARM mode since the location is
already aligned there.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoARM: 4-byte align start of all asm functions
Mans Rullgard [Fri, 13 Jan 2012 18:56:36 +0000 (18:56 +0000)]
ARM: 4-byte align start of all asm functions

Due to apprent bugs in the GNU assembler and/or linker, relocations
can be incorrectly processed if the alignment of a Thumb instruction
is changed in the output file compared to the input object.

This fixes crashes in h264 decoding with Thumb enabled. No effect in
ARM mode since everything is 4-byte aligned there.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoj2kdec: Fix memleak, ensure cleanup is called also on error.
Reimar Döffinger [Thu, 12 Jan 2012 20:52:22 +0000 (21:52 +0100)]
j2kdec: Fix memleak, ensure cleanup is called also on error.

Fixes valgrind fate with fate-suite/r3d/4MB-sample.r3d.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoffmpeg: fix return value in opt_old2new after e3127db4.
Clément Bœsch [Fri, 13 Jan 2012 17:56:59 +0000 (18:56 +0100)]
ffmpeg: fix return value in opt_old2new after e3127db4.

8 years agovf_deshake: remove unused variable totalangles
Ray Simard [Fri, 13 Jan 2012 02:03:36 +0000 (18:03 -0800)]
vf_deshake: remove unused variable totalangles

Variable totalangles was created and assigned, but never used.

Signed-off-by: Ray Simard <rhs.ffmpeg@sylvan-glade.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
8 years agovf_deshake: zero-init Transform structs in end_frame()
Ray Simard [Fri, 13 Jan 2012 01:21:06 +0000 (17:21 -0800)]
vf_deshake: zero-init Transform structs in end_frame()

Initialize Transform structs t and orig to zero.

Signed-off-by: Ray Simard <rhs.ffmpeg@sylvan-glade.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
8 years agoconfigure: provide libavfilter/version.h header to get_version()
Stefano Sabatini [Fri, 13 Jan 2012 15:23:55 +0000 (16:23 +0100)]
configure: provide libavfilter/version.h header to get_version()

Fix libavfilter library version numbers generation, which was broken in
3167dc9515810bbdd86d99d773bcf84657d2e72a.

8 years ago8svx: fix memleak in iff-fibonacci fate test.
Clément Bœsch [Fri, 13 Jan 2012 01:14:54 +0000 (02:14 +0100)]
8svx: fix memleak in iff-fibonacci fate test.

8 years agoffmpeg: use av_asprintf() in opt_old2new() and fix a memleak.
Clément Bœsch [Fri, 13 Jan 2012 00:53:34 +0000 (01:53 +0100)]
ffmpeg: use av_asprintf() in opt_old2new() and fix a memleak.

8 years agoffmpeg: fix parse_option() string memleak.
Clément Bœsch [Fri, 13 Jan 2012 00:49:41 +0000 (01:49 +0100)]
ffmpeg: fix parse_option() string memleak.

8 years agoico: favour BITMAPHEADER dimensions over IconEntry dimensions
Peter Ross [Fri, 13 Jan 2012 08:59:29 +0000 (19:59 +1100)]
ico: favour BITMAPHEADER dimensions over IconEntry dimensions

Fixes ticket 759.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg.c: transcode_video(): do not go through filter network if encoding is not...
Nicolas Noirbent [Fri, 13 Jan 2012 08:58:16 +0000 (09:58 +0100)]
ffmpeg.c: transcode_video(): do not go through filter network if encoding is not required

This fixes a segmentation fault when doing a transcoding and a stream
copy of the same input stream at the same time, e.g.:

ffmpeg -i in.mkv -c:v mpeg2video transcode.m2v -c copy copy.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosegment: fix FPE when segment_list_size is 0
Nicolas Noirbent [Fri, 13 Jan 2012 08:58:15 +0000 (09:58 +0100)]
segment: fix FPE when segment_list_size is 0

With the added benefit that allowing -segment_list_size 0 makes it
possible to keep all segment entries in the list file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "riff: remove references to sonic codec ids"
Michael Niedermayer [Fri, 13 Jan 2012 00:40:03 +0000 (01:40 +0100)]
Revert "riff: remove references to sonic codec ids"

This reverts commit 0fd88d398896353074fee153259dbf3530ca423f.

Theres no reason to drop support for this.

8 years agompegtsenc: do not reference the deprecated ffmpeg option 'vbsf' in a log message
Stefano Sabatini [Thu, 12 Jan 2012 23:01:31 +0000 (00:01 +0100)]
mpegtsenc: do not reference the deprecated ffmpeg option 'vbsf' in a log message

Give a more generic advice.

8 years agoffmpeg: clarify error message in case of bitstream filter opening failure
Stefano Sabatini [Thu, 12 Jan 2012 22:56:58 +0000 (23:56 +0100)]
ffmpeg: clarify error message in case of bitstream filter opening failure

8 years agompegtsenc: fix some typos: aac -> AAC, adts -> ADTS
Stefano Sabatini [Thu, 12 Jan 2012 18:46:39 +0000 (19:46 +0100)]
mpegtsenc: fix some typos: aac -> AAC, adts -> ADTS

8 years agompegtsenc: use more meaningful error codes
Stefano Sabatini [Thu, 12 Jan 2012 18:45:10 +0000 (19:45 +0100)]
mpegtsenc: use more meaningful error codes

8 years agorgb2rgb: rgb12to15()
Paul B Mahol [Thu, 12 Jan 2012 20:28:47 +0000 (20:28 +0000)]
rgb2rgb: rgb12to15()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoswscale-test: fix stack overread.
Ronald S. Bultje [Thu, 12 Jan 2012 23:38:37 +0000 (15:38 -0800)]
swscale-test: fix stack overread.

Fixes problems in swscale-test where it gives a 3-member array to a
function expecting a 4-member array.

8 years agoswscale: fix invalid conversions and memory problems.
Ronald S. Bultje [Thu, 12 Jan 2012 23:37:58 +0000 (15:37 -0800)]
swscale: fix invalid conversions and memory problems.

Fixes problems where rgbToRgbWrapper() is called even though it doesn't
support this particular conversion (e.g. converting from RGB444 to
anything). Thirdly, fixes issues where rgbToRgbWrapper() is called for
non-native endiannness conversions (e.g. RGB555BE on a LE system).
Fourthly, fixes crashes when converting from e.g. monowhite to
monowhite, which calls planarCopyWrapper() and overwrites/reads because
n_bytes != n_pixels.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 13 Jan 2012 00:07:30 +0000 (01:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (21 commits)
  utils: Check for extradata size overflows.
  ARM: rv34: fix asm syntax in dc transform functions
  avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
  rv34: fix and optimise frame dependency checking
  rv34: NEON optimised dc only inverse transform
  avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
  ffmenc: remove references to deprecated AVFormatContext.timestamp.
  lavf: undeprecate read_seek().
  avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
  lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
  lavc: ifdef out parse_only AVOption
  nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
  mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
  riff: remove references to sonic codec ids
  indeo4: add some missing static and const qualifiers
  rv34: DC-only inverse transform
  avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
  lavfi: move version macros to a new installed header version.h
  vsrc_buffer: release the buffer on uninit.
  rgb2rgb: rgb12tobgr12()
  ...

Conflicts:
avconv.c
doc/APIchanges
ffprobe.c
libavfilter/Makefile
libavfilter/avfilter.h
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>