ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-18 12:33:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,894 Commits 37 Branches 400 Tags 513 MiB
4116151a4b
Commit Graph

46894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
4116151a4b Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13' 
* commit '1c5805521c3e406886341d752ebf38f8d41e1d13':
  PGS subtitles: Set AVSubtitle pts value
  configure: Refactor CPPFLAGS settings for glibc/uclibc
  configure: add basic support for ARM AArch64
  build: set -U__STRICT_ANSI__ for newlib

Conflicts:
	configure
	libavcodec/pgssubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 14:05:41 +01:00
Michael Niedermayer
fdbb6164a2 sbr: increase f_tablelim size, it appears it was too small by 1. 
Prevent out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 13:09:02 +01:00
Paul B Mahol
b0d83e0dba doc/general: remove duplicate entry for ADPCM SMJPEG IMA 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 10:25:19 +00:00
Paul B Mahol
305fe9ae59 nut: add tag for PCM signed 8-bit planar 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 09:55:20 +00:00
Paul B Mahol
086e305276 doc/general: remove 8SVX audio, there is no such codec 
While here add missing PCM signed 8-bit planar.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 09:52:32 +00:00
Paul B Mahol
0dbf297229 doc/general: move 8SVX codecs to right section 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-19 09:52:25 +00:00
Carl Eugen Hoyos
a5d4e94a97 Support iLBC in caf. 2012-11-19 10:19:50 +01:00
Michael Niedermayer
ba353436a3 h264: dont stop parsing NALs without cleanup on DPC. 
Fixes a deadlock with frame threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 04:08:11 +01:00
Piotr Bandurski
45d8537ccf vble: do not abort when version is not 1 
Fixes ticket #1923.

Reviewed-by: Derek Buitenhuis
 2012-11-19 01:55:51 +01:00
Michael Niedermayer
24c043c98e mpegvideo: increase MAX_PICTURE_NUMBER. 
avoid abort().

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 01:38:06 +01:00
Piotr Bandurski
ade9960fc6 avrndec: support lowres for mjpeg 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-19 00:42:39 +01:00
Michael Niedermayer
e8fed4d331 error concealment: check that references are frames and not fields. 
frames cant have field references.
Fixes a deadlock

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 23:02:46 +01:00
Michael Niedermayer
8a03a60b4a h264: Check gray scale CBP, fix out of array accesses. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 23:02:46 +01:00
Michael Niedermayer
27d39c225b liavfi/avcodec: allow channel layouts with fewer channels than actually available. 
This fixes the regression with Ticket1726, where some audio was lost.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 22:54:18 +01:00
Paul B Mahol
0df7d95a5e pcmenc: remove dead increment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 21:12:25 +00:00
Paul B Mahol
6557c46d91 pcm: move i into for loop to avoid { } inside switch statement 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 20:45:03 +00:00
Paul B Mahol
a6f4c41a7e fate: add mjpeg-422 and mjpeg-444 tests 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 19:45:21 +00:00
Michael Niedermayer
36cf247e43 ff_h264_direct_ref_list_init: fix B slice check. 
Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 19:10:57 +01:00
Paul B Mahol
9f02d4ed0f mjpegenc: yuvj444p support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 17:46:45 +00:00
John Stebbins
1c5805521c PGS subtitles: Set AVSubtitle pts value 
pts should be that of the packet containing the presentation segment.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-11-18 18:34:05 +01:00
Stefano Sabatini
158763312f lavfi/frei0r: in init() check path loop, free resources in a single point 2012-11-18 16:52:46 +01:00
Stefano Sabatini
6c7ae49330 lavfi/frei0r: extend load_path() to support arbitrarily long paths 2012-11-18 16:52:46 +01:00
Michael Niedermayer
d6c184880e h264: correct ref count check and limit, fix out of array accesses. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 16:47:29 +01:00
Michael Niedermayer
2d5f1addbe h264: fix integer overflow, assert failure 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 16:47:29 +01:00
Michael Niedermayer
1a947dfa83 ff_mpeg_update_thread_context: assert context unequality 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 16:47:29 +01:00
Clément Bœsch
f48cddfe4c pp: add SSE2 deInterlaceInterpolateCubic(). 
2124 decicycles in deInterlaceInterpolateCubic_C, 67100774 runs, 8090 skips
458 decicycles in deInterlaceInterpolateCubic_MMX2, 67107146 runs, 1718 skips
382 decicycles in deInterlaceInterpolateCubic_SSE2, 67107086 runs, 1778 skips
 2012-11-18 16:21:59 +01:00
Clément Bœsch
4e264d1c79 pp: add support for SSE2. 2012-11-18 16:21:59 +01:00
Clément Bœsch
f6be711a69 lavfi/mp/pp: use PP_CPU_CAPS_AUTO. 2012-11-18 16:21:59 +01:00
Clément Bœsch
59d686f100 pp: add auto detection cpu flag. 2012-11-18 16:21:59 +01:00
Clément Bœsch
e034b07e40 pp: add various const for pointers. 2012-11-18 16:20:09 +01:00
Nicolas George
c437c251b8 lavfi/drawtext: implement more generic expansion. 
The new expansion mechanism uses the %{...} notation.
For compatibility reasons, it must be enabled explicitly,
but a warning is printed if a conflict is likely to happen.
 2012-11-18 15:55:47 +01:00
Piotr Bandurski
4413a8428a iff: decode HAM8 images with masking correctly. 
Fixes ticket #967.

Reviewed-by: Peter Ross
 2012-11-18 15:48:22 +01:00
Michael Niedermayer
4fecc3cf09 h264: Skip odd NALs in extradata, prevent undefined behavior 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 14:26:58 +01:00
Marton Balint
4bee03034b lavf: let av_find_best_stream use bitrate info if available 
I guess the user expects to see the stream with the highest bitrate, not with
the most frames, this is especially useful for multi bitrate streams.

This patch changes av_find_best_stream to select the stream based on a number
of conditions, the first condition has the highest priority, the last condition
has the lowest:

1) Select the stream with the highest FFMIN(5, codec_info_nb_frames) value
2) Select the stream with the highest bitrate
3) Select the stream with the highest codec_info_nb_frames
4) Select the first stream

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:57:08 +01:00
Peter Ross
05001dd7ca iff: process DEEP DLOC chunk to obtain image dimensions 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:47:17 +01:00
Peter Ross
d26eeb0dc1 iff: recognise more DEEP colorspaces 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:46:36 +01:00
Michael Niedermayer
0c79a3d9cb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32
  lavr: fix the decision for writing directly to the output buffer
  parisc: work around bug in gcc 4.3 and later

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 13:35:15 +01:00
Paul B Mahol
d0a503c97c ast: check bit depth too 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 12:29:05 +00:00
Paul B Mahol
f5f29910dd img2enc: remove dead code 
Nothing in lavc sets extradata for such codec and this is wrong place
for it anyway.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-18 12:09:20 +00:00
Diego Biurrun
3bd1eacd2a configure: Refactor CPPFLAGS settings for glibc/uclibc 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-11-18 12:00:18 +00:00
Mans Rullgard
5873b623a9 configure: add basic support for ARM AArch64 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-11-18 12:00:18 +00:00
Mans Rullgard
8f7b814f54 build: set -U__STRICT_ANSI__ for newlib 
This is (erroneously) required to enable various things in the
newlib headers.  As cygwin uses newlib, it is covered by this.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-11-18 12:00:17 +00:00
Carl Eugen Hoyos
ab82b77822 Fix possible NULL-pointer dereference when decoding mov files. 
Fixes CID743440, introduced in 850e5c0.
 2012-11-18 08:52:50 +01:00
Michael Niedermayer
dab19048a1 mjpegdec: reset h/v_count, fix assertion failure. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-18 06:00:44 +01:00
Ronald S. Bultje
7a9e65acee x86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32 
Fixes crashes on Win32 and stack overruns on x86-32 in general.
 2012-11-17 20:16:04 -05:00
Justin Ruggles
02738792c5 lavr: fix the decision for writing directly to the output buffer 
If there are any samples remaining in the output fifo from previous conversion
calls, we have to output those samples first instead of doing direct output
of the current samples.
 2012-11-17 20:09:40 -05:00
Paul B Mahol
e3edee6d2f eamad: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 20:28:52 +00:00
Paul B Mahol
d98364edce smush: check audio packet size 
Fixes null pointer dereference.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-17 19:58:54 +00:00
Michael Niedermayer
845724c82c vcr1: check if dimensions are supported, fix out of array accesses. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 20:43:56 +01:00
Michael Niedermayer
fb1ea777b3 electronicarts: check size before reading duration out of a chunk. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-17 20:43:56 +01:00