ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-05 20:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,211 Commits 37 Branches 400 Tags 497 MiB
bf0712c2f8
Commit Graph

50211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
bdeb61ccc6 h264: check that luma and chroma depth match 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 15:02:09 +01:00
Matt Wolenetz
311443f6c7 x86: h264: Don't use redzone in AVX h264_deblock on Win64 
This fixes crashes in chromium on win64 on machines with AVX
(crashes that apparently aren't triggered by fate).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-02-21 15:02:16 +02:00
Paul B Mahol
59015c1118 exr: constify s in rle_uncompress() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-21 12:02:18 +00:00
Paul B Mahol
a3d890527e exr: reset compression in decode_frame() 
This fixes decoding of images if compression changes.
Regression since b040ffc84c.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-21 12:02:18 +00:00
Michael Niedermayer
6b8f21190d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dxva2: Add missing #define to make header compile standalone
  arm: vp8: Add missing #includes for header to compile standalone
  doc: filters: Correct BNF FILTER description

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 12:59:38 +01:00
Nicolas George
9fa5a47197 ffmpeg: set resample_pix_fmt for sub2video. 
Forgotten when the resample_* fields were added.
Fix assert failures.
 2013-02-21 12:41:30 +01:00
Nicolas George
01649c79c8 lavfi/buffersrc: set channel layout if it is known. 
If buffersrc was configured for frames with an unknown layout,
the incoming frames will have channel_layout = 0.
If the format negotiation has selected a known (and compatible)
channel layout for the link, the frame is assumed to have
that layout, the field must be set before injecting the frame
in the filters.
 2013-02-21 12:36:35 +01:00
Carl Eugen Hoyos
d714576037 Use SMPTE standard notation when showing mxf Universal Labels. 2013-02-21 09:11:22 +01:00
Michael Niedermayer
cdb7a1ac63 vf_idet: adapt default scores due to bugfix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Michael Niedermayer
dc9edb06b0 vf_idet: Fix macro arguments sideeffect 
Fixes valgrind errors
should improve detection scores

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Clément Bœsch
9ed6af4be2 fate/subtitles: add MicroDVD remux test. 2013-02-21 00:59:32 +01:00
Clément Bœsch
7346354b55 lavf/microdvd: fix muxing. 
This was broken since 1f265f52.
 2013-02-21 00:59:32 +01:00
Clément Bœsch
580e228557 lavf/swfdec: remove 8-bit audio FIXME. 
Implemented since 624fb5f9.
 2013-02-21 00:59:31 +01:00
Michael Niedermayer
551d8b58eb brender_pix: use a grayscale palette as fallback instead of a uninitialized one. 
Improves: 3-0-CORPSE.PIX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 00:26:50 +01:00
Michael Niedermayer
47e92153b6 mjpegdec: check for packed rgb mjpeg. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 00:03:36 +01:00
Carl Eugen Hoyos
c4dc6c4c86 Fix bits_per_coded_sample when encoding png with frame-level multithreading. 
Fixes ticket #2290.
 2013-02-20 22:54:21 +01:00
Clément Bœsch
624fb5f965 lavf/swfdec: support 8-bits PCM audio. 2013-02-20 21:49:23 +01:00
Clément Bœsch
9a0076f50c lavf/swfdec: factorize the creation of a new stream. 
This also makes the changes of a3949fe11 applicable in both cases.
 2013-02-20 21:49:23 +01:00
Michael Niedermayer
da7672b20a h264: Fix handling of changing reference counts between slices 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 19:53:54 +01:00
Michael Niedermayer
039f55c803 h264: call alloc_scratch_buffers() only once linesize is known 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 19:53:54 +01:00
Clément Bœsch
9b9d996b34 lavfi/subtitles: fix recently introduced warning about discarded const qualifier. 2013-02-20 19:47:32 +01:00
Stefano Sabatini
22b06103f0 lavfi/overlay: add format option 
In particular, fix misbehavior in case main and overlay input formats
mismatch (e.g. YUV420 and YUV444).
 2013-02-20 19:39:40 +01:00
Stefano Sabatini
2db0056f96 lavfi/overlay: apply minor consistency fixes 2013-02-20 19:18:17 +01:00
Stefano Sabatini
3d77a27548 lavfi/overlay: implement shortest option 
Force termination when the overlay stream ends. Simplify scripting logic,
for example when an infinite source is used to generate a background for
a composite video.
 2013-02-20 19:17:11 +01:00
Stefano Sabatini
7f07c61c2f doc/filters: rework introductory description for decimate 
In particular, dedicate first paragraph to deliver a short description of
the filter.
 2013-02-20 19:11:19 +01:00
Stefano Sabatini
a2a1e20fa2 lavfi/decimate: use named options 2013-02-20 19:07:48 +01:00
Stefano Sabatini
49c8fe304f doc/filters: apply misc fixes to drawbox documentation 2013-02-20 19:01:48 +01:00
Michael Niedermayer
2ccaab9709 mov: fix self referencing timecode tracks 
Fixes read after free.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 15:46:33 +01:00
Diego Biurrun
a0a1ac0f09 dxva2: Add missing #define to make header compile standalone 2013-02-20 14:24:07 +01:00
Diego Biurrun
3e85b46ecf arm: vp8: Add missing #includes for header to compile standalone 2013-02-20 14:24:07 +01:00
Michael Niedermayer
951d39fecd avfilter: fix segfault with setsar/dar 
Reported-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 12:34:05 +01:00
Michael Niedermayer
f7b46d86de Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  intreadwrite: tomi: Add missing attributes.h #include for av_always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 12:04:50 +01:00
Stefano Sabatini
271f411267 lavf/matroskaenc: avoid assert failure in case of cuepoints with duplicated PTS 
Avoid to write more than one cuepoint per track and PTS in
mkv_write_cues(). This avoids a later assertion failure on "(bytes >=
needed_bytes)" in put_ebml_num() called from end_ebml_master(), in case
there are several cuepoints per track with the same PTS.

This may happen with files containing packets with duplicated PTS in the
same track.
 2013-02-20 12:01:21 +01:00
Michael Niedermayer
39b03932c2 Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609' 
* commit '8a11ce43d08352f7a290355ebb5b29c495ad9609':
  build: Ensure that output directories for header objects are created
  h264: Get rid of unnecessary casts

Conflicts:
	common.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 11:54:06 +01:00
Michael Niedermayer
8c6d9ca638 Merge commit 'fae6fd5b873911cfcd7f7b3d72de6598af5e003a' 
* commit 'fae6fd5b873911cfcd7f7b3d72de6598af5e003a':
  h264/svq3: Stop using draw_edges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 11:50:12 +01:00
Michael Niedermayer
98f63e1f34 Merge commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc' 
* commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc':
  h264: Don't store intra pcm samples in h->mb
  get_bits: Return pointer to buffer that is the result of the alignment

Conflicts:
	libavcodec/h264_mb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 11:47:32 +01:00
Vicente Jimenez Aguilar
b5ad422bf4 doc: filters: Correct BNF FILTER description 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-02-20 11:34:05 +01:00
Stefano Sabatini
dd37326345 lavfi/hue: reindent after previous commit 2013-02-20 11:29:12 +01:00
Stefano Sabatini
d709a18ac2 lavfi/hue: simplify parsing by making use of option shorthands 2013-02-20 11:28:59 +01:00
Michael Niedermayer
088f20a332 Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0' 
* commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0':
  h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil

Conflicts:
	libavcodec/dsputil.c
	libavcodec/h264.c
	libavcodec/h264_mb_template.c
	libavcodec/h264addpx_template.c
	libavcodec/h264dsp.c
	libavcodec/h264dsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 11:17:32 +01:00
Michael Niedermayer
536d1ed793 Merge commit 'e5ffffe48d20642acc079166f0fa7d93a6a9f594' 
* commit 'e5ffffe48d20642acc079166f0fa7d93a6a9f594':
  h264chroma: Remove duplicate 9/10 bit functions
  x86: Use simple nop codes for <= sse (rather than <= mmx)
  vp56: Remove clear_blocks call, and clear alpha plane U/V DC only

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 10:57:47 +01:00
u-bo1b@0w.se
8d1dd5bd50 cinepak: More correct Cinepak decoder. 
change the treatment of the strip y coordinates which previously did
not follow the description (nor did it behave like the binary decoder
on files with absolute strip offsets).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 04:14:04 +01:00
Michael Niedermayer
a3adbedf9b cinepak: simplify 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 04:14:04 +01:00
u-bo1b@0w.se
4e635e10e2 cinepak: Use correct colorspace. 
The new code is also faster and more robust.

As for the performance:

old decoder + conversion to rgb:         fps = 2618
old decoder, without converting to rgb:  fps = 4012

new decoder, producing rgb:              fps = 4502

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 04:13:33 +01:00
Michael Niedermayer
f5c00b347d avcodec_align_dimensions2: Ensure cinepak has large enough buffers. 
This is partly redundant with the following patches, but its safer

Found-by: u-bo1b@0w.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 03:54:36 +01:00
Ronald S. Bultje
2b10d41464 h264: add videodsp dependency. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 02:12:26 +01:00
Diego Biurrun
c9ad5f59aa intreadwrite: tomi: Add missing attributes.h #include for av_always_inline 2013-02-20 00:45:30 +01:00
Diego Biurrun
8a11ce43d0 build: Ensure that output directories for header objects are created 2013-02-20 00:45:30 +01:00
Michael Niedermayer
c69315a5de cook: check js_subband_start for validity 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 00:20:03 +01:00
Martin Storsjö
26ee5ca03d h264: Get rid of unnecessary casts 
This gets rid of a number of warnings about casts discarding
qualifiers from the pointer target, present since 7ebfb466a.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-02-20 00:25:29 +02:00