ffmpeg.git
6 years agoMerge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'
Michael Niedermayer [Tue, 20 Nov 2012 12:34:27 +0000 (13:34 +0100)]
Merge commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a'

* commit '7c278d2ae410a64bdd89f1777026b4b963c30a1a':
  alacenc: support 24-bit encoding
  pcmdec: use planar sample format for pcm_s16le_planar
  vorbisdec: use float planar sample format

Conflicts:
libavcodec/pcm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago8svx: move pcm_s8_planar decoder to pcm.c
Paul B Mahol [Sun, 18 Nov 2012 18:50:57 +0000 (18:50 +0000)]
8svx: move pcm_s8_planar decoder to pcm.c

Removes limitation of max 2 channels for pcm_s8_planar decoder by moving
it to more natural place.

AV_CODEC_ID_8SVX_RAW is not used by anything anymore and is going to be
removed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years ago4xm: return error code if decode_init() failed
Paul B Mahol [Tue, 20 Nov 2012 09:42:32 +0000 (09:42 +0000)]
4xm: return error code if decode_init() failed

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoalacenc: support 24-bit encoding
Justin Ruggles [Fri, 9 Nov 2012 22:01:09 +0000 (17:01 -0500)]
alacenc: support 24-bit encoding

6 years agopcmdec: use planar sample format for pcm_s16le_planar
Justin Ruggles [Tue, 28 Aug 2012 15:12:40 +0000 (11:12 -0400)]
pcmdec: use planar sample format for pcm_s16le_planar

6 years agovorbisdec: use float planar sample format
Justin Ruggles [Wed, 29 Aug 2012 02:43:05 +0000 (22:43 -0400)]
vorbisdec: use float planar sample format

6 years agoaacsbr: check sample_rate before using it, fix division by 0
Michael Niedermayer [Tue, 20 Nov 2012 02:20:43 +0000 (03:20 +0100)]
aacsbr: check sample_rate before using it, fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years ago4xmdec: fix integer overflow, null ptr dereference
Michael Niedermayer [Tue, 20 Nov 2012 01:59:55 +0000 (02:59 +0100)]
4xmdec: fix integer overflow, null ptr dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoiff: DEEP RLE 32-bit decoder
Peter Ross [Sun, 18 Nov 2012 07:44:04 +0000 (18:44 +1100)]
iff: DEEP RLE 32-bit decoder

Fixes ticket #1046.

Signed-off-by: Peter Ross <pross@xvid.org>
6 years agomips: Optimization of AC3 FP encoder and EAC3 FP decoder
Bojan Zivkovic [Tue, 6 Nov 2012 13:06:21 +0000 (14:06 +0100)]
mips: Optimization of AC3 FP encoder and EAC3 FP decoder

Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reveiwed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: set default channel count options to 0.
Clément Bœsch [Mon, 19 Nov 2012 17:46:05 +0000 (18:46 +0100)]
swr: set default channel count options to 0.

If not set, they will be defined using the channel layout setting, which
is much more convenient when using swr_alloc() instead of
swr_alloc_set_opts().

6 years agoAllow use of @ character in username and passwords embedded in URLs
Gavin Kinsey [Thu, 15 Nov 2012 10:56:47 +0000 (10:56 +0000)]
Allow use of @ character in username and passwords embedded in URLs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopthreads: increase MAX_BUFFERS due to 24c043c98ef22b9d4aa7a54ec5f1cebd21042dd7
Michael Niedermayer [Mon, 19 Nov 2012 16:31:12 +0000 (17:31 +0100)]
pthreads: increase MAX_BUFFERS due to 24c043c98ef22b9d4aa7a54ec5f1cebd21042dd7

This might fix a hypothetical memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.
Michael Niedermayer [Mon, 19 Nov 2012 14:55:23 +0000 (15:55 +0100)]
af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovble: remove superfluous braces
Piotr Bandurski [Mon, 19 Nov 2012 09:49:37 +0000 (10:49 +0100)]
vble: remove superfluous braces

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 19 Nov 2012 13:24:10 +0000 (14:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_intrapred: Fix C function names in comments
  x86: SPLATD: port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1c5805521c3e406886341d752ebf38f8d41e1d13'
Michael Niedermayer [Mon, 19 Nov 2012 13:05:41 +0000 (14:05 +0100)]
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>
6 years agosbr: increase f_tablelim size, it appears it was too small by 1.
Michael Niedermayer [Mon, 19 Nov 2012 04:01:01 +0000 (05:01 +0100)]
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>
6 years agodoc/general: remove duplicate entry for ADPCM SMJPEG IMA
Paul B Mahol [Mon, 19 Nov 2012 10:23:54 +0000 (10:23 +0000)]
doc/general: remove duplicate entry for ADPCM SMJPEG IMA

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agonut: add tag for PCM signed 8-bit planar
Paul B Mahol [Mon, 19 Nov 2012 09:54:07 +0000 (09:54 +0000)]
nut: add tag for PCM signed 8-bit planar

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/general: remove 8SVX audio, there is no such codec
Paul B Mahol [Mon, 19 Nov 2012 09:50:05 +0000 (09:50 +0000)]
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>
6 years agodoc/general: move 8SVX codecs to right section
Paul B Mahol [Mon, 19 Nov 2012 09:47:33 +0000 (09:47 +0000)]
doc/general: move 8SVX codecs to right section

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoSupport iLBC in caf.
Carl Eugen Hoyos [Mon, 19 Nov 2012 09:19:50 +0000 (10:19 +0100)]
Support iLBC in caf.

6 years agoh264: dont stop parsing NALs without cleanup on DPC.
Michael Niedermayer [Mon, 19 Nov 2012 02:37:59 +0000 (03:37 +0100)]
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>
6 years agovble: do not abort when version is not 1
Piotr Bandurski [Mon, 19 Nov 2012 00:55:51 +0000 (01:55 +0100)]
vble: do not abort when version is not 1

Fixes ticket #1923.

Reviewed-by: Derek Buitenhuis
6 years agompegvideo: increase MAX_PICTURE_NUMBER.
Michael Niedermayer [Mon, 19 Nov 2012 00:36:55 +0000 (01:36 +0100)]
mpegvideo: increase MAX_PICTURE_NUMBER.

avoid abort().

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavrndec: support lowres for mjpeg
Piotr Bandurski [Mon, 5 Nov 2012 17:24:34 +0000 (18:24 +0100)]
avrndec: support lowres for mjpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoerror concealment: check that references are frames and not fields.
Michael Niedermayer [Sun, 18 Nov 2012 21:51:54 +0000 (22:51 +0100)]
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>
6 years agoh264: Check gray scale CBP, fix out of array accesses.
Michael Niedermayer [Sun, 18 Nov 2012 20:36:06 +0000 (21:36 +0100)]
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>
6 years agoliavfi/avcodec: allow channel layouts with fewer channels than actually available.
Michael Niedermayer [Sun, 18 Nov 2012 18:26:46 +0000 (19:26 +0100)]
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>
6 years agopcmenc: remove dead increment
Paul B Mahol [Sun, 18 Nov 2012 21:12:25 +0000 (21:12 +0000)]
pcmenc: remove dead increment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopcm: move i into for loop to avoid { } inside switch statement
Paul B Mahol [Sun, 18 Nov 2012 20:43:33 +0000 (20:43 +0000)]
pcm: move i into for loop to avoid { } inside switch statement

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: add mjpeg-422 and mjpeg-444 tests
Paul B Mahol [Sun, 18 Nov 2012 18:03:45 +0000 (18:03 +0000)]
fate: add mjpeg-422 and mjpeg-444 tests

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoff_h264_direct_ref_list_init: fix B slice check.
Michael Niedermayer [Sun, 18 Nov 2012 17:46:05 +0000 (18:46 +0100)]
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>
6 years agomjpegenc: yuvj444p support
Paul B Mahol [Wed, 7 Nov 2012 21:44:27 +0000 (21:44 +0000)]
mjpegenc: yuvj444p support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agox86: h264_intrapred: Fix C function names in comments
Diego Biurrun [Wed, 14 Nov 2012 00:47:11 +0000 (01:47 +0100)]
x86: h264_intrapred: Fix C function names in comments

Function names changed after switching to declaration with
PRED4x4/8x8/8x8L/16x16 macros in the C code.

6 years agoPGS subtitles: Set AVSubtitle pts value
John Stebbins [Fri, 2 Nov 2012 16:30:39 +0000 (09:30 -0700)]
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>
6 years agox86: SPLATD: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 16:33:59 +0000 (18:33 +0200)]
x86: SPLATD: port to cpuflags

6 years agolavfi/frei0r: in init() check path loop, free resources in a single point
Stefano Sabatini [Fri, 16 Nov 2012 09:58:37 +0000 (10:58 +0100)]
lavfi/frei0r: in init() check path loop, free resources in a single point

6 years agolavfi/frei0r: extend load_path() to support arbitrarily long paths
Stefano Sabatini [Fri, 16 Nov 2012 09:45:25 +0000 (10:45 +0100)]
lavfi/frei0r: extend load_path() to support arbitrarily long paths

6 years agoh264: correct ref count check and limit, fix out of array accesses.
Michael Niedermayer [Sun, 18 Nov 2012 15:29:04 +0000 (16:29 +0100)]
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>
6 years agoh264: fix integer overflow, assert failure
Michael Niedermayer [Sun, 18 Nov 2012 14:23:54 +0000 (15:23 +0100)]
h264: fix integer overflow, assert failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_mpeg_update_thread_context: assert context unequality
Michael Niedermayer [Sun, 18 Nov 2012 01:56:29 +0000 (02:56 +0100)]
ff_mpeg_update_thread_context: assert context unequality

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopp: add SSE2 deInterlaceInterpolateCubic().
Clément Bœsch [Sat, 17 Nov 2012 10:03:45 +0000 (11:03 +0100)]
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

6 years agopp: add support for SSE2.
Clément Bœsch [Fri, 16 Nov 2012 23:09:01 +0000 (00:09 +0100)]
pp: add support for SSE2.

6 years agolavfi/mp/pp: use PP_CPU_CAPS_AUTO.
Clément Bœsch [Sun, 18 Nov 2012 14:12:37 +0000 (15:12 +0100)]
lavfi/mp/pp: use PP_CPU_CAPS_AUTO.

6 years agopp: add auto detection cpu flag.
Clément Bœsch [Wed, 14 Nov 2012 22:21:56 +0000 (23:21 +0100)]
pp: add auto detection cpu flag.

6 years agopp: add various const for pointers.
Clément Bœsch [Fri, 16 Nov 2012 22:43:50 +0000 (23:43 +0100)]
pp: add various const for pointers.

6 years agolavfi/drawtext: implement more generic expansion.
Nicolas George [Sat, 10 Nov 2012 18:46:37 +0000 (19:46 +0100)]
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.

6 years agoiff: decode HAM8 images with masking correctly.
Piotr Bandurski [Sun, 18 Nov 2012 14:48:22 +0000 (15:48 +0100)]
iff: decode HAM8 images with masking correctly.

Fixes ticket #967.

Reviewed-by: Peter Ross
6 years agoh264: Skip odd NALs in extradata, prevent undefined behavior
Michael Niedermayer [Sun, 18 Nov 2012 13:23:06 +0000 (14:23 +0100)]
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>
6 years agolavf: let av_find_best_stream use bitrate info if available
Marton Balint [Sun, 18 Nov 2012 12:19:14 +0000 (13:19 +0100)]
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>
6 years agoiff: process DEEP DLOC chunk to obtain image dimensions
Peter Ross [Sun, 18 Nov 2012 08:02:03 +0000 (19:02 +1100)]
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>
6 years agoiff: recognise more DEEP colorspaces
Peter Ross [Sun, 18 Nov 2012 08:01:41 +0000 (19:01 +1100)]
iff: recognise more DEEP colorspaces

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 18 Nov 2012 12:35:11 +0000 (13:35 +0100)]
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>
6 years agoast: check bit depth too
Paul B Mahol [Sun, 18 Nov 2012 12:29:05 +0000 (12:29 +0000)]
ast: check bit depth too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoimg2enc: remove dead code
Paul B Mahol [Sun, 18 Nov 2012 12:09:20 +0000 (12:09 +0000)]
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>
6 years agoconfigure: Refactor CPPFLAGS settings for glibc/uclibc
Diego Biurrun [Sat, 13 Oct 2012 17:21:34 +0000 (18:21 +0100)]
configure: Refactor CPPFLAGS settings for glibc/uclibc

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: add basic support for ARM AArch64
Mans Rullgard [Fri, 16 Nov 2012 21:02:53 +0000 (21:02 +0000)]
configure: add basic support for ARM AArch64

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agobuild: set -U__STRICT_ANSI__ for newlib
Mans Rullgard [Fri, 16 Nov 2012 21:02:15 +0000 (21:02 +0000)]
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>
6 years agoFix possible NULL-pointer dereference when decoding mov files.
Carl Eugen Hoyos [Sun, 18 Nov 2012 07:52:50 +0000 (08:52 +0100)]
Fix possible NULL-pointer dereference when decoding mov files.

Fixes CID743440, introduced in 850e5c0.

6 years agomjpegdec: reset h/v_count, fix assertion failure.
Michael Niedermayer [Sat, 17 Nov 2012 20:07:39 +0000 (21:07 +0100)]
mjpegdec: reset h/v_count, fix assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: lavr: fix stack allocation for 7 and 8 channel downmixing on x86-32
Ronald S. Bultje [Mon, 29 Oct 2012 20:18:04 +0000 (16:18 -0400)]
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.

6 years agolavr: fix the decision for writing directly to the output buffer
Justin Ruggles [Thu, 1 Nov 2012 14:13:51 +0000 (10:13 -0400)]
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.

6 years agoeamad: return meaningful error codes
Paul B Mahol [Sat, 17 Nov 2012 20:28:52 +0000 (20:28 +0000)]
eamad: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosmush: check audio packet size
Paul B Mahol [Sat, 17 Nov 2012 19:58:54 +0000 (19:58 +0000)]
smush: check audio packet size

Fixes null pointer dereference.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovcr1: check if dimensions are supported, fix out of array accesses.
Michael Niedermayer [Sat, 17 Nov 2012 19:17:22 +0000 (20:17 +0100)]
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>
6 years agoelectronicarts: check size before reading duration out of a chunk.
Michael Niedermayer [Sat, 17 Nov 2012 18:56:26 +0000 (19:56 +0100)]
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>
6 years agoAST demuxer
Paul B Mahol [Wed, 14 Nov 2012 17:53:22 +0000 (17:53 +0000)]
AST demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoPCM signed 16-bit big-endian planar decoder
Paul B Mahol [Thu, 15 Nov 2012 16:17:55 +0000 (16:17 +0000)]
PCM signed 16-bit big-endian planar decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolxfdec: remove deplanarization hack
Paul B Mahol [Fri, 16 Nov 2012 15:10:36 +0000 (15:10 +0000)]
lxfdec: remove deplanarization hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoPCM signed 24-bit/32-bit little-endian planar decoder
Paul B Mahol [Fri, 16 Nov 2012 16:00:04 +0000 (16:00 +0000)]
PCM signed 24-bit/32-bit little-endian planar decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/texi2pod: recognize @table @command.
Nicolas George [Sun, 11 Nov 2012 17:44:10 +0000 (18:44 +0100)]
doc/texi2pod: recognize @table @command.

6 years agolavfi/drawtext: use bprint for the expanded text.
Nicolas George [Sat, 10 Nov 2012 15:06:32 +0000 (16:06 +0100)]
lavfi/drawtext: use bprint for the expanded text.

6 years agolavu/bprint: implement av_bprint_strftime().
Nicolas George [Sat, 10 Nov 2012 15:05:53 +0000 (16:05 +0100)]
lavu/bprint: implement av_bprint_strftime().

6 years agoparisc: work around bug in gcc 4.3 and later
Mans Rullgard [Wed, 14 Nov 2012 15:56:46 +0000 (15:56 +0000)]
parisc: work around bug in gcc 4.3 and later

A bug in tail call optimisation in gcc 4.3 and later on parisc causes
numerous tests to fail.  Disabling this optimisation gives a working
build.  See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55023

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoflvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.
Michael Niedermayer [Sat, 17 Nov 2012 17:47:36 +0000 (18:47 +0100)]
flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.

I was unable to find a file that needs this hack, if you have one please
contact us!
Fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoeamad: fix out of array accesses
Michael Niedermayer [Sat, 17 Nov 2012 15:26:55 +0000 (16:26 +0100)]
eamad: fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 17 Nov 2012 12:06:12 +0000 (13:06 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a bink version 'b' test
  FATE: add a bink version 'i' test
  libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'
Michael Niedermayer [Sat, 17 Nov 2012 11:58:00 +0000 (12:58 +0100)]
Merge commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e'

* commit '8f5587c3d0bc4b5f075e4282215bda91a21fc12e':
  cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
  h264: Fix parameters to ff_er_add_slice() call
  h264: always check ref_count for validity

Conflicts:
libavcodec/h264.c
libavutil/cpu.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: free the report file name.
Nicolas George [Sat, 17 Nov 2012 10:24:01 +0000 (11:24 +0100)]
cmdutils: free the report file name.

Fix coverity issue 743443, which was a harmless leak.

6 years agoconfigure: add --fatal-warnings option.
Nicolas George [Sun, 11 Nov 2012 20:37:50 +0000 (21:37 +0100)]
configure: add --fatal-warnings option.

6 years agoconfigure: warn when en/disabling has no effect.
Nicolas George [Sun, 11 Nov 2012 20:29:27 +0000 (21:29 +0100)]
configure: warn when en/disabling has no effect.

Print a warning for --enable- or --disable-something=pattern
does not match any component.

6 years agolavf/avienc: return proper error codes, and provide some more feedback
Stefano Sabatini [Fri, 16 Nov 2012 11:02:22 +0000 (12:02 +0100)]
lavf/avienc: return proper error codes, and provide some more feedback

6 years agoFATE: add a bink version 'b' test
Anton Khirnov [Thu, 15 Nov 2012 08:56:54 +0000 (09:56 +0100)]
FATE: add a bink version 'b' test

6 years agoFATE: add a bink version 'i' test
Anton Khirnov [Thu, 15 Nov 2012 08:56:54 +0000 (09:56 +0100)]
FATE: add a bink version 'i' test

6 years agoxxan: check ybuf index before use.
Michael Niedermayer [Sat, 17 Nov 2012 03:45:38 +0000 (04:45 +0100)]
xxan: check ybuf index before use.

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocook: check subbands more completely, fix out of array read.
Michael Niedermayer [Sat, 17 Nov 2012 02:42:48 +0000 (03:42 +0100)]
cook: check subbands more completely, fix out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_mpeg4videodec_static_init: fix return type
Michael Niedermayer [Sat, 17 Nov 2012 01:31:11 +0000 (02:31 +0100)]
ff_mpeg4videodec_static_init: fix return type

Fixes CID743439
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: fix potential integer overflow in mxf_compute_sample_count()
Michael Niedermayer [Sat, 17 Nov 2012 01:20:50 +0000 (02:20 +0100)]
mxfdec: fix potential integer overflow in mxf_compute_sample_count()

Fixes CID743442
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocpu: add a few cpu names as aliases for their cpu flags
Michael Niedermayer [Sat, 17 Nov 2012 01:08:12 +0000 (02:08 +0100)]
cpu: add a few cpu names as aliases for their cpu flags

Help to complete this list is welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocpu: add cmov ro the table, which appears to have been forgotten
Michael Niedermayer [Sat, 17 Nov 2012 01:04:30 +0000 (02:04 +0100)]
cpu: add cmov ro the table, which appears to have been forgotten

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotm2: check for invalid vlcs, fix out of array read
Michael Niedermayer [Sat, 17 Nov 2012 00:09:20 +0000 (01:09 +0100)]
tm2: check for invalid vlcs, fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopp: simplify postProcess().
Clément Bœsch [Wed, 14 Nov 2012 20:08:59 +0000 (21:08 +0100)]
pp: simplify postProcess().

6 years agopp: rework the way templating is done.
Clément Bœsch [Wed, 14 Nov 2012 19:20:35 +0000 (20:20 +0100)]
pp: rework the way templating is done.

This refactoring simplifies the usage of the template: define the
profile and include the template is all that is required. It should now
be easier to add more instruction sets.

The HAVE_* flags are changed with TEMPLATE_PP_* setting to avoid messing
them up.

See the top comment in postprocess_template.c for details.

6 years agog723_1dec: Fix lsp2lpc() so it can handle values at the ends of the table.
Michael Niedermayer [Fri, 16 Nov 2012 20:25:40 +0000 (21:25 +0100)]
g723_1dec: Fix lsp2lpc() so it can handle values at the ends of the table.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_emulated_edge_mc: fix integer anomalies, fix out of array reads
Michael Niedermayer [Fri, 16 Nov 2012 19:57:35 +0000 (20:57 +0100)]
ff_emulated_edge_mc: fix integer anomalies, fix out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions
Alexander Strasser [Sat, 3 Nov 2012 16:05:51 +0000 (17:05 +0100)]
dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions

Move the NO_DSHOW_STRSAFE macro definition in front of the dshow.h
system header inclusion.

This excludes the usage of the STRSAFE functions consistently.

Further background on this can be found in the commit message of
revision 05ee0db1 where the #define was initially introduced.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agoffv1enc: consider 2pass float rounding, fix loop
Michael Niedermayer [Fri, 16 Nov 2012 15:55:48 +0000 (16:55 +0100)]
ffv1enc: consider 2pass float rounding, fix loop

Found-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: fix a few typos in the frei0r docs
Stefano Sabatini [Fri, 16 Nov 2012 10:22:21 +0000 (11:22 +0100)]
doc/filters: fix a few typos in the frei0r docs