ffmpeg.git
7 years agolavfi: port MP swapuv filter
Stefano Sabatini [Thu, 8 Mar 2012 15:18:03 +0000 (16:18 +0100)]
lavfi: port MP swapuv filter

7 years agoimgconvert: add macro pixdesc_has_alpha for checking if a pixel format has an alpha...
Stefano Sabatini [Thu, 8 Mar 2012 13:40:30 +0000 (14:40 +0100)]
imgconvert: add macro pixdesc_has_alpha for checking if a pixel format has an alpha component

Reduce redundancy and simplify.

7 years agompegvideo_probe: Fix misdetection of mpeg4video files.
Michael Niedermayer [Fri, 9 Mar 2012 21:25:32 +0000 (22:25 +0100)]
mpegvideo_probe: Fix misdetection of mpeg4video files.

(issue1210)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: Add system to seperate relative timestamps from absolute ones.
Michael Niedermayer [Wed, 7 Mar 2012 21:13:39 +0000 (22:13 +0100)]
lavf: Add system to seperate relative timestamps from absolute ones.

With this we can always know if a timestamp is based on added durations
from an unknown origin or if it is based on a correct timestamp (and possibly
added durations)
This should fix some bugs where this distinction was mixed up.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoCosmetics: Remove superfluous newline.
Carl Eugen Hoyos [Fri, 9 Mar 2012 13:34:10 +0000 (14:34 +0100)]
Cosmetics: Remove superfluous newline.

7 years agoFix 32bit sunrast decoding.
Carl Eugen Hoyos [Fri, 9 Mar 2012 08:17:07 +0000 (09:17 +0100)]
Fix 32bit sunrast decoding.

This patch visually breaks the sample from ticket #895,
but decodes it identically as Gimp, ImageMagick and xview.

7 years agoiff: add support for IFF DEEP
Piotr Bandurski [Thu, 8 Mar 2012 22:34:36 +0000 (23:34 +0100)]
iff: add support for IFF DEEP

Fixes trac #1045.

Thanks to Peter Ross for his help with this patch.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosvq1dec: use AV_LOG_ERROR for error message
Piotr Bandurski [Thu, 8 Mar 2012 22:27:17 +0000 (23:27 +0100)]
svq1dec: use AV_LOG_ERROR for error message

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 9 Mar 2012 00:22:31 +0000 (01:22 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ttadec: unbreak playback of matroska files
  vorbisdec: avoid invalid memory access
  Fix uninitialized reads on malformed ogg files.
  huffyuv: add padding to classic (v1) huffman tables.
  png: convert to bytestream2 API.
  dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
  avs: fix infinite loop on end-of-stream.
  tiffdec: Prevent illegal memory access caused by recycled pointers.
  rtpenc: Fix the AVRational used for av_rescale_q_rnd
  wma: fix off-by-one in array bounds check.

Conflicts:
libavcodec/huffyuv.c
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqpeg: remove unused var from decode_frame()
Michael Niedermayer [Thu, 8 Mar 2012 22:05:25 +0000 (23:05 +0100)]
qpeg: remove unused var from decode_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoprores_anatoliy: remove unused variable from prores_encode_frame()
Michael Niedermayer [Thu, 8 Mar 2012 22:04:22 +0000 (23:04 +0100)]
prores_anatoliy: remove unused variable from prores_encode_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: enable libutvideo is gpl warning
Lou Logan [Thu, 8 Mar 2012 19:18:13 +0000 (10:18 -0900)]
configure: enable libutvideo is gpl warning

This will warn the user when --enable-gpl is missing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggparseogm: Fix order or arguments.
Michael Niedermayer [Thu, 8 Mar 2012 20:11:37 +0000 (21:11 +0100)]
oggparseogm: Fix order or arguments.

Bug introduced by libav in 1bb3990b560e7ff7f46c06c14f959fe432e0b625

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: Discard invalid CTTS.
Michael Niedermayer [Thu, 8 Mar 2012 06:10:57 +0000 (07:10 +0100)]
mov: Discard invalid CTTS.

Fixes Ticket385

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agottadec: unbreak playback of matroska files
Paul B Mahol [Tue, 6 Mar 2012 20:26:48 +0000 (20:26 +0000)]
ttadec: unbreak playback of matroska files

Matroska demuxer needs to recreate tta header, so just display
crc error without aborting.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agovorbisdec: avoid invalid memory access
Aaron Colwell [Wed, 7 Mar 2012 22:51:00 +0000 (14:51 -0800)]
vorbisdec: avoid invalid memory access

This fixes some invalid memory access caused later in the function
by res_chan[] not being set for all channels. This happens when a
channel doesn't appear a submap. This change simply returns a
decoder error when this situation is detected.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoFix uninitialized reads on malformed ogg files.
Dale Curtis [Wed, 7 Mar 2012 22:26:58 +0000 (14:26 -0800)]
Fix uninitialized reads on malformed ogg files.

The ogg decoder wasn't padding the input buffer with the appropriate
FF_INPUT_BUFFER_PADDING_SIZE bytes. Which led to uninitialized reads in
various pieces of parsing code when they thought they had more data than
they actually did.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agohuffyuv: add padding to classic (v1) huffman tables.
Ronald S. Bultje [Thu, 8 Mar 2012 00:29:23 +0000 (16:29 -0800)]
huffyuv: add padding to classic (v1) huffman tables.

We slightly overread the input buffer, so we require
padding at the end of the buffer, as is documented in the
get_bits API. Without padding, we'll read uninitialized
data or beyond the end of the .rodata, which may crash.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agopng: convert to bytestream2 API.
Ronald S. Bultje [Thu, 8 Mar 2012 00:16:20 +0000 (16:16 -0800)]
png: convert to bytestream2 API.

Protects against overreads in the input buffer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agolavc/utils: fix three const warnings.
Nicolas George [Wed, 7 Mar 2012 19:07:44 +0000 (20:07 +0100)]
lavc/utils: fix three const warnings.

No change in assembly code produced on x86_64.

7 years agoffplay: fix two const warnings.
Nicolas George [Wed, 7 Mar 2012 19:02:51 +0000 (20:02 +0100)]
ffplay: fix two const warnings.

No change in assembly code produced on x86_64.

7 years agovf_pad: keep a reference to the output buffer.
Nicolas George [Wed, 7 Mar 2012 16:10:00 +0000 (17:10 +0100)]
vf_pad: keep a reference to the output buffer.

Once fixed, the end_frame function does exactly what
avfilter_default_end_frame does; therefore, end_frame
can be removed to let avfilter_default_end_frame work.

Fixes ticket #1038.

7 years agodoc/ffmpeg.texi: apply misc fixes to the -map_channel documentation
Stefano Sabatini [Sat, 3 Mar 2012 18:19:40 +0000 (19:19 +0100)]
doc/ffmpeg.texi: apply misc fixes to the -map_channel documentation

7 years agodca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
Kostya Shishkov [Wed, 7 Mar 2012 19:07:17 +0000 (20:07 +0100)]
dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 8 Mar 2012 01:28:40 +0000 (02:28 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (29 commits)
  sbrdsp.asm: convert all instructions to float/SSE ones.
  dv: cosmetics.
  dv: check buffer size before reading profile.
  Revert "AAC SBR: group some writes."
  udp: Print an error message if bind fails
  cook: extend channel uncoupling tables so the full bit range is covered.
  roqvideo: cosmetics.
  roqvideo: convert to bytestream2 API.
  dca: don't use av_clip_uintp2().
  wmall: fix build with -DDEBUG enabled.
  smc: port to bytestream2 API.
  AAC SBR: group some writes.
  dsputil: remove shift parameter from scalarproduct_int16
  SBR DSP: unroll sum_square
  rv34: remove dead code in intra availability check
  rv34: clean a bit availability checks.
  v4l2: update documentation
  tgq: convert to bytestream2 API.
  parser: remove forward declaration of MpegEncContext
  dca: prevent accessing static arrays with invalid indexes.
  ...

Conflicts:
doc/indevs.texi
libavcodec/Makefile
libavcodec/dca.c
libavcodec/dvdata.c
libavcodec/eatgq.c
libavcodec/mmvideo.c
libavcodec/roqvideodec.c
libavcodec/smc.c
libswscale/output.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavs: fix infinite loop on end-of-stream.
Ronald S. Bultje [Thu, 16 Feb 2012 00:21:34 +0000 (16:21 -0800)]
avs: fix infinite loop on end-of-stream.

The codec would keep returning the last decoded frame if the stream
contains B-frames, since it wouldn't clear that frame from the list of
frames to be returned to the user.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoavformat_new_stream: fix initial last_dts value
Michael Niedermayer [Wed, 7 Mar 2012 20:41:54 +0000 (21:41 +0100)]
avformat_new_stream: fix initial last_dts value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotiffdec: Prevent illegal memory access caused by recycled pointers.
Alex Converse [Wed, 7 Mar 2012 01:00:29 +0000 (17:00 -0800)]
tiffdec: Prevent illegal memory access caused by recycled pointers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agomxfdec: Add intra_only flag to MXFTrack
Tomas Härdin [Wed, 7 Mar 2012 09:52:39 +0000 (10:52 +0100)]
mxfdec: Add intra_only flag to MXFTrack

This allows future assumptions to be made without affecting non-intra files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: Fix Avid AirSpeed files being misinterpreted as OP1a
Tomas Härdin [Fri, 2 Mar 2012 10:33:28 +0000 (11:33 +0100)]
mxfdec: Fix Avid AirSpeed files being misinterpreted as OP1a

The "ECs != 1 -> OP1a" assumption was wrong. Luckily, the file that triggered
that behavior had two ECs, not zero. Hence distinguishing between them is
simple in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfdec: Truncate packets that extend past the next edit unit
Tomas Härdin [Fri, 2 Mar 2012 10:16:10 +0000 (11:16 +0100)]
mxfdec: Truncate packets that extend past the next edit unit

This fixes rare cases where OPAtom may be treated as OP1a, causing all essence
to be read into RAM.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavutil: document av_force_cpu_flags(-1).
Michael Niedermayer [Wed, 7 Mar 2012 04:18:33 +0000 (05:18 +0100)]
libavutil: document av_force_cpu_flags(-1).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortpenc: Fix the AVRational used for av_rescale_q_rnd
Martin Storsjö [Wed, 7 Mar 2012 22:52:53 +0000 (00:52 +0200)]
rtpenc: Fix the AVRational used for av_rescale_q_rnd

The current one has a zero denominator - this is what was
intended in 14aecc50fae6.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoffmpeg: show fps more accurately when it is small.
Nicolas George [Wed, 7 Mar 2012 22:26:29 +0000 (23:26 +0100)]
ffmpeg: show fps more accurately when it is small.

7 years agoswr: special case for empty channels in rematrix.
Nicolas George [Mon, 20 Feb 2012 22:55:28 +0000 (23:55 +0100)]
swr: special case for empty channels in rematrix.

Speed += 10% overall for pan=stereo:FL=FL+FR from wav to null.

7 years agowma: fix off-by-one in array bounds check.
Ronald S. Bultje [Wed, 7 Mar 2012 22:18:14 +0000 (14:18 -0800)]
wma: fix off-by-one in array bounds check.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agosbrdsp.asm: convert all instructions to float/SSE ones.
Reimar Döffinger [Wed, 7 Mar 2012 20:35:13 +0000 (21:35 +0100)]
sbrdsp.asm: convert all instructions to float/SSE ones.

Since the values are floats, using the float operations
makes sense, improves performance on some CPUs and
makes the code SSE compatible instead of needing SSE2.

Based on suggestion by Jason.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agodv: cosmetics.
Ronald S. Bultje [Wed, 7 Mar 2012 21:49:41 +0000 (13:49 -0800)]
dv: cosmetics.

7 years agodv: check buffer size before reading profile.
Ronald S. Bultje [Wed, 7 Mar 2012 21:48:41 +0000 (13:48 -0800)]
dv: check buffer size before reading profile.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoRevert "AAC SBR: group some writes."
Ronald S. Bultje [Wed, 7 Mar 2012 18:52:09 +0000 (10:52 -0800)]
Revert "AAC SBR: group some writes."

This reverts commit ba36f14e5d34bcca6ecf77ba1c7512d1b51a9740. It
broke decoding on x86-32 on some systems.

7 years agoudp: Print an error message if bind fails
Martin Storsjö [Wed, 7 Mar 2012 19:40:29 +0000 (21:40 +0200)]
udp: Print an error message if bind fails

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agocook: extend channel uncoupling tables so the full bit range is covered.
Ronald S. Bultje [Tue, 6 Mar 2012 21:45:32 +0000 (13:45 -0800)]
cook: extend channel uncoupling tables so the full bit range is covered.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoroqvideo: cosmetics.
Ronald S. Bultje [Wed, 7 Mar 2012 18:59:45 +0000 (10:59 -0800)]
roqvideo: cosmetics.

7 years agoroqvideo: convert to bytestream2 API.
Ronald S. Bultje [Tue, 6 Mar 2012 23:58:35 +0000 (15:58 -0800)]
roqvideo: convert to bytestream2 API.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agodca: don't use av_clip_uintp2().
Ronald S. Bultje [Wed, 7 Mar 2012 19:06:20 +0000 (11:06 -0800)]
dca: don't use av_clip_uintp2().

The argument is not a literal, thus causing the ARM v6 or later
builds to break.

7 years agowmall: fix build with -DDEBUG enabled.
Ronald S. Bultje [Wed, 7 Mar 2012 18:40:15 +0000 (10:40 -0800)]
wmall: fix build with -DDEBUG enabled.

7 years agosmc: port to bytestream2 API.
Ronald S. Bultje [Wed, 29 Feb 2012 22:44:37 +0000 (14:44 -0800)]
smc: port to bytestream2 API.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoAAC SBR: group some writes.
Christophe Gisquet [Tue, 28 Feb 2012 10:20:02 +0000 (11:20 +0100)]
AAC SBR: group some writes.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agodsputil: remove shift parameter from scalarproduct_int16
Christophe GISQUET [Sat, 3 Mar 2012 14:09:36 +0000 (15:09 +0100)]
dsputil: remove shift parameter from scalarproduct_int16

There is only one caller, which does not need the shifting. Other use cases
are situations where different roundings would be needed.

The x86 and neon versions are modified accordingly.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoSBR DSP: unroll sum_square
Christophe GISQUET [Wed, 22 Feb 2012 16:48:59 +0000 (17:48 +0100)]
SBR DSP: unroll sum_square

The length is even, so some unrolling can be performed. Timings are for x86:
- 32bits: 102c -> 82c
- 64bits:  82c -> 69c

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorv34: remove dead code in intra availability check
Christophe GISQUET [Thu, 23 Feb 2012 18:10:32 +0000 (19:10 +0100)]
rv34: remove dead code in intra availability check

This was an incorrect copy-and-paste to a code not needing the original code.
Spotted by Jason in a previous review but forgotten in the commit.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agorv34: clean a bit availability checks.
Christophe GISQUET [Mon, 16 Jan 2012 19:54:26 +0000 (20:54 +0100)]
rv34: clean a bit availability checks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agov4l2: update documentation
Luca Barbato [Sat, 3 Mar 2012 11:24:56 +0000 (12:24 +0100)]
v4l2: update documentation

Update the examples and remove stale information.
Video4linux support had been already removed.

7 years agotgq: convert to bytestream2 API.
Ronald S. Bultje [Tue, 6 Mar 2012 22:18:32 +0000 (14:18 -0800)]
tgq: convert to bytestream2 API.

This protects against input buffer overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoparser: remove forward declaration of MpegEncContext
Paul B Mahol [Wed, 7 Mar 2012 07:16:37 +0000 (07:16 +0000)]
parser: remove forward declaration of MpegEncContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agodca: prevent accessing static arrays with invalid indexes.
Ronald S. Bultje [Wed, 29 Feb 2012 02:11:59 +0000 (18:11 -0800)]
dca: prevent accessing static arrays with invalid indexes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoraw: move buffer size check up.
Ronald S. Bultje [Wed, 7 Mar 2012 00:08:10 +0000 (16:08 -0800)]
raw: move buffer size check up.

This way, it protects against overreads for 4bpp/2bpp content also.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agolpcm: fix sample size calculation for 20bit LCPM.
Ronald S. Bultje [Wed, 7 Mar 2012 04:08:17 +0000 (20:08 -0800)]
lpcm: fix sample size calculation for 20bit LCPM.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoswscale: clip unscaled output intermediates.
Ronald S. Bultje [Tue, 6 Mar 2012 22:35:24 +0000 (14:35 -0800)]
swscale: clip unscaled output intermediates.

Fixes bug 240, as well as several integer overflows (visible as glitches)
in other scaling output routines, e.g. YUV422.

7 years agosmacker: error out if palette copy-with-offset overruns palette size.
Ronald S. Bultje [Wed, 7 Mar 2012 01:24:20 +0000 (17:24 -0800)]
smacker: error out if palette copy-with-offset overruns palette size.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoalgmm: convert to bytestream2 API.
Ronald S. Bultje [Tue, 6 Mar 2012 23:15:42 +0000 (15:15 -0800)]
algmm: convert to bytestream2 API.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agovf_yadif: accept input with several frames available.
Nicolas George [Wed, 7 Mar 2012 16:34:28 +0000 (17:34 +0100)]
vf_yadif: accept input with several frames available.

Fixes ticket #1040.

7 years agoass_split: accept files with only \n and no \r.
Nicolas George [Wed, 29 Feb 2012 12:46:32 +0000 (13:46 +0100)]
ass_split: accept files with only \n and no \r.

The +1 is there to skip the ','.
With \r\n, the +1 skips the \r but that is ok.
With only \n, the +1 skips it and all hell breaks loose.

7 years agoassdec: avoid a possible NULL dereference.
Nicolas George [Wed, 29 Feb 2012 12:46:13 +0000 (13:46 +0100)]
assdec: avoid a possible NULL dereference.

7 years agowma: Refactor common code to fix standalone compilation of WMA lossless decoder.
Diego Biurrun [Tue, 6 Mar 2012 18:07:10 +0000 (19:07 +0100)]
wma: Refactor common code to fix standalone compilation of WMA lossless decoder.

7 years agovc1: Move init code shared between decoder and parser to common code file.
Diego Biurrun [Tue, 6 Mar 2012 17:59:03 +0000 (18:59 +0100)]
vc1: Move init code shared between decoder and parser to common code file.

This fixes standalone compilation of the VC-1 parser.

7 years agox86: Remove duplicated AVG_3DNOW_OP / AVG_MMX2_OP macros from h264_qpel_mmx.c.
Diego Biurrun [Tue, 6 Mar 2012 11:59:41 +0000 (12:59 +0100)]
x86: Remove duplicated AVG_3DNOW_OP / AVG_MMX2_OP macros from h264_qpel_mmx.c.

7 years agoffv1: PIX_FMT_YUV444P10 support
Paul B Mahol [Tue, 6 Mar 2012 23:16:40 +0000 (23:16 +0000)]
ffv1: PIX_FMT_YUV444P10 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: PIX_FMT_YUV444P9 & PIX_FMT_YUV422P9 support
Paul B Mahol [Tue, 6 Mar 2012 23:16:39 +0000 (23:16 +0000)]
ffv1: PIX_FMT_YUV444P9 & PIX_FMT_YUV422P9 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoRevert "error_resilience: initialize s->block_index[]."
Michael Niedermayer [Wed, 7 Mar 2012 02:39:15 +0000 (03:39 +0100)]
Revert "error_resilience: initialize s->block_index[]."

This reverts commit 6193ff68549ecbaf1a4d63a0e06964ec580ac620.

This change is unneeded.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Mar 2012 01:57:53 +0000 (02:57 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  SBR DSP: fix SSE code to not use SSE2 instructions.
  cpu: initialize mask to -1, so that by default, optimizations are used.
  error_resilience: initialize s->block_index[].
  svq3: protect against negative quantizers.
  Don't use ff_cropTbl[] for IDCT.
  swscale: make filterPos 32bit.
  FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option.
  avconv: add -cpuflags option for setting supported cpuflags.
  cpu: add av_set_cpu_flags_mask().
  libx264: Allow overriding the sliced threads option
  avconv: fix counting encoded video size.

Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffmpeg.texi
ffmpeg.c
libavcodec/h264idct_template.c
libavcodec/svq3.c
libavutil/avutil.h
libavutil/cpu.c
libavutil/cpu.h
libswscale/swscale.c
tests/Makefile
tests/fate-run.sh
tests/regression-funcs.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/utils: fix const correctness of AVClass cast
Michael Niedermayer [Tue, 6 Mar 2012 23:47:11 +0000 (00:47 +0100)]
lavc/utils: fix const correctness of AVClass cast

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/utils: remove unused variable from avcodec_encode_video2.
Michael Niedermayer [Tue, 6 Mar 2012 23:45:18 +0000 (00:45 +0100)]
lavc/utils: remove unused variable from avcodec_encode_video2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpegenc: Fix const correctness and avoid writes into AVFrame of amv_encode_picture()
Michael Niedermayer [Tue, 6 Mar 2012 23:40:39 +0000 (00:40 +0100)]
mjpegenc: Fix const correctness and avoid writes into AVFrame of amv_encode_picture()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264 Fix: "warning: assigning to 'uint8_t *' (aka 'unsigned char *') from 'const...
Michael Niedermayer [Tue, 6 Mar 2012 23:33:55 +0000 (00:33 +0100)]
h264 Fix: "warning: assigning to 'uint8_t *' (aka 'unsigned char *') from 'const uint8_t *' (aka 'const unsigned char *') discards qualifiers"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix warning about "uint8_t *p" and const
Michael Niedermayer [Tue, 6 Mar 2012 23:32:02 +0000 (00:32 +0100)]
h264: fix warning about "uint8_t *p" and const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocook: silence some signed overflow warnings.
Michael Niedermayer [Tue, 6 Mar 2012 23:29:23 +0000 (00:29 +0100)]
cook: silence some signed overflow warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomov: Allow last chunk to have an arbitrary number of samples.
Carl Eugen Hoyos [Sat, 3 Dec 2011 11:29:41 +0000 (12:29 +0100)]
mov: Allow last chunk to have an arbitrary number of samples.

Fixes ticket #673.
(cherry picked from commit 8dcd2a41ecff8cc1e9b20cc267df54c59878ab3b)

Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agoswscale: remove duplicate PIX_FMT_GBRP entry from format_entries.
Michael Niedermayer [Tue, 6 Mar 2012 23:22:20 +0000 (00:22 +0100)]
swscale: remove duplicate PIX_FMT_GBRP entry from format_entries.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovsrx_mptestsrc: remove duplicate config_props init.
Michael Niedermayer [Tue, 6 Mar 2012 23:20:23 +0000 (00:20 +0100)]
vsrx_mptestsrc: remove duplicate config_props init.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSBR DSP: fix SSE code to not use SSE2 instructions.
Reimar Döffinger [Tue, 6 Mar 2012 21:11:30 +0000 (22:11 +0100)]
SBR DSP: fix SSE code to not use SSE2 instructions.

movq from SSE register _to_ memory is an SSE2 instruction.
Use the SSE movlps function instead that does the same thing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agocpu: initialize mask to -1, so that by default, optimizations are used.
Ronald S. Bultje [Tue, 6 Mar 2012 20:47:23 +0000 (12:47 -0800)]
cpu: initialize mask to -1, so that by default, optimizations are used.

7 years agoaacdec: Fix out of array writes (stack).
Michael Niedermayer [Tue, 6 Mar 2012 20:21:02 +0000 (21:21 +0100)]
aacdec: Fix out of array writes (stack).

This fixes an issue in the code to check the size that will
be written to match the actual code writing. In the long
term it would make sense to change this so the counting and
writing code are the same so they dont need to be kept in sync.

It also increases the array size, which was too small either way
and adds a redudnant saftey check.

This issue does not affect any FFmpeg release as it has been
introduced Jan 31 which is narrowly after our last release.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix bink decoder for files with 24px width.
Bastien Bouclet [Tue, 6 Mar 2012 19:16:20 +0000 (20:16 +0100)]
Fix bink decoder for files with 24px width.

Fixes ticket #962.

7 years agoerror_resilience: initialize s->block_index[].
Ronald S. Bultje [Tue, 6 Mar 2012 18:27:05 +0000 (10:27 -0800)]
error_resilience: initialize s->block_index[].

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agosvq3: protect against negative quantizers.
Ronald S. Bultje [Tue, 6 Mar 2012 01:03:32 +0000 (17:03 -0800)]
svq3: protect against negative quantizers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoDon't use ff_cropTbl[] for IDCT.
Ronald S. Bultje [Tue, 6 Mar 2012 00:01:19 +0000 (16:01 -0800)]
Don't use ff_cropTbl[] for IDCT.

Results of IDCT can by far outreach the range of ff_cropTbl[], leading
to overreads and potentially crashes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agoswscale: make filterPos 32bit.
Ronald S. Bultje [Mon, 5 Mar 2012 20:26:42 +0000 (12:26 -0800)]
swscale: make filterPos 32bit.

Fixes overflows for large image sizes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agodiracdec: Correct the bytestream end pointer.
Michael Niedermayer [Tue, 6 Mar 2012 18:13:55 +0000 (19:13 +0100)]
diracdec: Correct the bytestream end pointer.

This fixes some arith decoder overreads and a potential infinite loop.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFATE: add CPUFLAGS variable, mapping to -cpuflags avconv option.
Anton Khirnov [Mon, 5 Mar 2012 07:05:56 +0000 (08:05 +0100)]
FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option.

7 years agoavconv: add -cpuflags option for setting supported cpuflags.
Anton Khirnov [Sun, 4 Mar 2012 15:46:45 +0000 (16:46 +0100)]
avconv: add -cpuflags option for setting supported cpuflags.

Useful for testing.

7 years agocpu: add av_set_cpu_flags_mask().
Anton Khirnov [Sun, 4 Mar 2012 15:08:48 +0000 (16:08 +0100)]
cpu: add av_set_cpu_flags_mask().

7 years agolibx264: Allow overriding the sliced threads option
Martin Storsjö [Mon, 5 Mar 2012 19:54:17 +0000 (21:54 +0200)]
libx264: Allow overriding the sliced threads option

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavconv: fix counting encoded video size.
Anton Khirnov [Tue, 6 Mar 2012 07:57:58 +0000 (08:57 +0100)]
avconv: fix counting encoded video size.

avcodec_encode_video2() return value is 0 on success, encoded frame size
is stored in the packet.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Mar 2012 02:56:25 +0000 (03:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (31 commits)
  cdxl demux: do not create packets with uninitialized data at EOF.
  Replace computations of remaining bits with calls to get_bits_left().
  amrnb/amrwb: Remove get_bits usage.
  cosmetics: reindent
  avformat: do not require a pixel/sample format if there is no decoder
  avformat: do not fill-in audio packet duration in compute_pkt_fields()
  lavf: Use av_get_audio_frame_duration() in get_audio_frame_size()
  dca_parser: parse the sample rate and frame durations
  libspeexdec: do not set AVCodecContext.frame_size
  libopencore-amr: do not set AVCodecContext.frame_size
  alsdec: do not set AVCodecContext.frame_size
  siff: do not set AVCodecContext.frame_size
  amr demuxer: do not set AVCodecContext.frame_size.
  aiffdec: do not set AVCodecContext.frame_size
  mov: do not set AVCodecContext.frame_size
  ape: do not set AVCodecContext.frame_size.
  rdt: remove workaround for infinite loop with aac
  avformat: do not require frame_size in avformat_find_stream_info() for CELT
  avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
  avformat: do not require frame_size in avformat_find_stream_info() for AAC
  ...

Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/dsputil_mmx.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocdxl demux: do not create packets with uninitialized data at EOF.
Reimar Döffinger [Sun, 26 Feb 2012 22:47:41 +0000 (22:47 +0000)]
cdxl demux: do not create packets with uninitialized data at EOF.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agolibutvideo: Add Ut Video encoder wrapper
Derek Buitenhuis [Mon, 5 Mar 2012 20:29:23 +0000 (15:29 -0500)]
libutvideo: Add Ut Video encoder wrapper

All colorspaces are supported.

Renamed libutvideo.cpp to libutvideodec.cpp.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibutvideo: Move structs and includes to header
Derek Buitenhuis [Sun, 4 Mar 2012 00:53:59 +0000 (19:53 -0500)]
libutvideo: Move structs and includes to header

This is so the forthcoming encoder wrapper can share
them.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoReplace computations of remaining bits with calls to get_bits_left().
Alex Converse [Mon, 5 Mar 2012 01:53:50 +0000 (17:53 -0800)]
Replace computations of remaining bits with calls to get_bits_left().

7 years agoamrnb/amrwb: Remove get_bits usage.
Alex Converse [Mon, 5 Mar 2012 01:24:38 +0000 (17:24 -0800)]
amrnb/amrwb: Remove get_bits usage.

It is used to parse fixed sized fields out of a single octet. The code
is simpler without it.