1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

37027 Commits

Author SHA1 Message Date
Reimar Döffinger
c4ba5198ea 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>
2012-01-14 17:23:57 +01:00
Laurent BRULET
45c39e566f udp: fix segfault on closing
Fixes ticket915
2012-01-14 17:14:18 +01:00
Justin Ruggles
633606c905 FATE: fix targa tests on big-endian systems 2012-01-14 16:43:41 +01:00
Michael Niedermayer
0b4f1e0d3d 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>
2012-01-14 16:41:06 +01:00
Stefano Sabatini
4057505e28 doc/bistream_filters.texi: add documentation for the h264_mp4toannexb filter 2012-01-14 12:36:41 +01:00
Carl Eugen Hoyos
28002030f2 Support transparency in iff images.
Fixes ticket #707.

Reviewed-by: Peter Ross
2012-01-14 10:38:42 +01:00
Carl Eugen Hoyos
6ba74be511 Add CR/LF to a reget_buffer warning message. 2012-01-14 10:35:03 +01:00
Stefano Sabatini
b5c2b5af6a configure: provide libavfilter/version.h header to get_version()
Fix libavfilter library version numbers generation, which was broken in
3167dc9515.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-01-14 07:44:43 +01:00
Oana Stratulat
a63a86fd6f Fixes issue 890: OOM with zmbv file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-14 07:19:27 +01:00
Michael Niedermayer
44e191457a utils: check that parameters havnt changed in reget_buffer()
Fixes Ticket902

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-14 04:55:15 +01:00
Michael Niedermayer
2422e8271c cabac_functions: fix license header, this wasnt developed in libav
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-14 04:51:13 +01:00
Michael Niedermayer
c834c7e39c 1000l commit forgotten cabac fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-14 04:47:27 +01:00
Michael Niedermayer
e986a5d10d 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>
2012-01-14 02:22:09 +01:00
Ronald S. Bultje
3c172a4106 swscale: change yuv2yuvX code to use cpuflag(). 2012-01-13 16:57:01 -08:00
Carl Eugen Hoyos
36397ea1c7 RGBA64 encoding with libopenjpeg.
Reviewed-by: Michael Bradshaw
2012-01-14 01:34:16 +01:00
Carl Eugen Hoyos
ffd1017fb8 Gray16 encoding with libopenjpeg.
Reviewed-by: Michael Bradshaw
2012-01-14 01:31:53 +01:00
Baptiste Coudurier
89fc7e36c7 alacdec: support 32 bps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-14 01:17:06 +01:00
Michael Niedermayer
8d95eb6702 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>
2012-01-14 01:17:06 +01:00
Carl Eugen Hoyos
dd55adb1a7 Support reading 64bit dpx images.
Reviewed-by: Jean First
2012-01-14 01:15:42 +01:00
Carl Eugen Hoyos
0b1f20e23c Support reading 64bit sgi images.
Reviewed-by: Jean First
2012-01-14 01:14:51 +01:00
Carl Eugen Hoyos
3fe4540b08 Support 64bit pam encoding. 2012-01-14 01:13:20 +01:00
Carl Eugen Hoyos
c714cd3bd4 Support 64bit tiff images.
Fixes a part of ticket #503.

Reviewed-by: Paul B Mahol
Reviewed-by: Jean First
2012-01-14 01:10:13 +01:00
Martin Storsjö
57facb73ab 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>
2012-01-14 02:08:42 +02:00
Carl Eugen Hoyos
93af38ca93 Increase maximum encoding video buffer size.
libavutil now supports 64bit RGB formats.
2012-01-14 00:59:02 +01:00
Carl Eugen Hoyos
7c10d3ca2e Simplify 32bit RGB pam encoding.
Reviewed-by: Paul B Mahol
2012-01-14 00:58:40 +01:00
Justin Ruggles
4c82c6d993 FATE: convert output to rgba for the targa tests which currently output pal8
fixes the tests on big-endian systems
2012-01-13 18:40:12 -05:00
Janne Grunau
502bf3b462 fate: add missing reference files for targa tests in 9c2f9b0e2
Fixes fate-targa-conformance-CCM8 and fate-targa-conformance-UCM8.
2012-01-13 23:52:59 +01:00
Justin Ruggles
9c2f9b0e2d FATE: enable the 2 remaining targa conformance suite tests 2012-01-13 17:13:12 -05:00
Justin Ruggles
faaebcdf6b targa: add support for rgb555 palette 2012-01-13 17:11:41 -05:00
Justin Ruggles
e1a7af6f29 FATE: fix targa tests on big-endian systems 2012-01-13 16:14:48 -05:00
Justin Ruggles
68d6012c72 FATE: add tests for targa
Based on a patch by Oana Stratulat <oanaandreeastratulat@gmail.com>
2012-01-13 15:45:30 -05:00
Mans Rullgard
71b3a63e9c 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>
2012-01-13 19:09:59 +00:00
Mans Rullgard
5c5e1ea3cd 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>
2012-01-13 19:09:59 +00:00
Reimar Döffinger
4cef928ef7 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>
2012-01-13 19:51:19 +01:00
Clément Bœsch
ad12d60d73 ffmpeg: fix return value in opt_old2new after e3127db4. 2012-01-13 18:57:05 +01:00
Ray Simard
369befb41e 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>
2012-01-13 17:00:21 +01:00
Ray Simard
7f6004fc74 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>
2012-01-13 16:59:50 +01:00
Stefano Sabatini
e4fa15d156 configure: provide libavfilter/version.h header to get_version()
Fix libavfilter library version numbers generation, which was broken in
3167dc9515.
2012-01-13 16:28:27 +01:00
Clément Bœsch
f2193569a5 8svx: fix memleak in iff-fibonacci fate test. 2012-01-13 16:22:25 +01:00
Clément Bœsch
e3127db438 ffmpeg: use av_asprintf() in opt_old2new() and fix a memleak. 2012-01-13 16:22:20 +01:00
Clément Bœsch
2a81e0c2ad ffmpeg: fix parse_option() string memleak. 2012-01-13 16:22:16 +01:00
Peter Ross
3a1df393b8 ico: favour BITMAPHEADER dimensions over IconEntry dimensions
Fixes ticket 759.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-13 15:57:34 +01:00
Nicolas Noirbent
c949d5b15d 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>
2012-01-13 15:57:34 +01:00
Nicolas Noirbent
62a22b2865 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>
2012-01-13 15:57:34 +01:00
Michael Niedermayer
645569e19f Revert "riff: remove references to sonic codec ids"
This reverts commit 0fd88d3988.

Theres no reason to drop support for this.
2012-01-13 15:57:34 +01:00
Stefano Sabatini
0be8e66174 mpegtsenc: do not reference the deprecated ffmpeg option 'vbsf' in a log message
Give a more generic advice.
2012-01-13 15:51:30 +01:00
Stefano Sabatini
7efc6f2932 ffmpeg: clarify error message in case of bitstream filter opening failure 2012-01-13 15:51:24 +01:00
Stefano Sabatini
3fcf841ff5 mpegtsenc: fix some typos: aac -> AAC, adts -> ADTS 2012-01-13 15:51:06 +01:00
Stefano Sabatini
9a7f2aa958 mpegtsenc: use more meaningful error codes 2012-01-13 15:50:54 +01:00
Paul B Mahol
0cc1a86dc3 rgb2rgb: rgb12to15()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-01-12 16:43:17 -08:00