]> git.sesse.net Git - ffmpeg/log
ffmpeg
12 years agoCheck for out of bound reads in the Tiertex Limited SEQ decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:47 +0000 (00:05 +0200)]
Check for out of bound reads in the Tiertex Limited SEQ decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix the size of workspace buffers in the motion pixels decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:49 +0000 (00:05 +0200)]
Fix the size of workspace buffers in the motion pixels decoder.

Some buffers must be mod 4 in width and/or height.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoClear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer used...
Laurent Aimar [Thu, 29 Sep 2011 22:05:48 +0000 (00:05 +0200)]
Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer used in motion pixels decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for out of bounds writes in the Delphine Software International CIN decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:51 +0000 (00:05 +0200)]
Check for out of bounds writes in the Delphine Software International CIN decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for out of bounds reads in the Delphine Software International CIN decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:50 +0000 (00:05 +0200)]
Check for out of bounds reads in the Delphine Software International CIN decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for out of bound reads in the QuickDraw decoder.
Laurent Aimar [Thu, 29 Sep 2011 22:05:46 +0000 (00:05 +0200)]
Check for out of bound reads in the QuickDraw decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoRevert "general.texi: we dont have a g729 encoder yet"
Michael Niedermayer [Thu, 29 Sep 2011 23:16:30 +0000 (01:16 +0200)]
Revert "general.texi: we dont have a g729 encoder yet"

This reverts commit 84f8aef40c7091274ed399a8aeaa933ea76d9476.

12 years agofate: only test 10seconds of the g729 data, the reference files are too huge otherwise.
Michael Niedermayer [Thu, 29 Sep 2011 22:13:26 +0000 (00:13 +0200)]
fate: only test 10seconds of the g729 data, the reference files are too huge otherwise.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibstagefright: change Libav to FFmpeg in copyright header with permission of author.
Michael Niedermayer [Thu, 29 Sep 2011 21:50:05 +0000 (23:50 +0200)]
libstagefright: change Libav to FFmpeg in copyright header with permission of author.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: g729 test
Michael Niedermayer [Thu, 29 Sep 2011 21:49:42 +0000 (23:49 +0200)]
fate: g729 test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723_1_demuxer: rco is also a commonly used extension.
Michael Niedermayer [Thu, 29 Sep 2011 20:14:25 +0000 (22:14 +0200)]
g723_1_demuxer: rco is also a commonly used extension.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomov: Only touch extradata in mov_read_extradata() if codec_id is what we expect
Tomas Härdin [Wed, 28 Sep 2011 08:34:51 +0000 (10:34 +0200)]
mov: Only touch extradata in mov_read_extradata() if codec_id is what we expect

Extradata should only be parsed from the avss, fiel, jp2h and alac atoms for
AVS, MJPEG, Motion JPEG 2000 and ALAC respectively.
This also fixes the mov demuxer coming up with bogus extradata for some
AVC-Intra samples due to the presence of fiel atoms.

12 years agoCheck for out of bound reads in xan_huffman_decode() of the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 22:45:54 +0000 (00:45 +0200)]
Check for out of bound reads in xan_huffman_decode() of the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoadd LJ2K and LJ2C to jpeg2000 decoder
Compn [Thu, 29 Sep 2011 21:14:08 +0000 (17:14 -0400)]
add LJ2K and LJ2C to jpeg2000 decoder
works on http://web.archive.org/web/20070128115405/http://www.leadcodecs.com/Download/MJ2K/WhatBox_MJ2k_720x480_PerfectQuality2.avi

12 years agog723.1: very minor simplify of gen_acb_excitation()
Michael Niedermayer [Thu, 29 Sep 2011 19:50:59 +0000 (21:50 +0200)]
g723.1: very minor simplify of gen_acb_excitation()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723.1: use MULL(a,b,15) for MULL2()
Michael Niedermayer [Thu, 29 Sep 2011 19:46:37 +0000 (21:46 +0200)]
g723.1: use MULL(a,b,15) for MULL2()

idea by vitor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723.1: simplify scale_vector()
Michael Niedermayer [Thu, 29 Sep 2011 19:40:42 +0000 (21:40 +0200)]
g723.1: simplify scale_vector()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723.1: replace loop of normalize_bits( by av_log2()
Michael Niedermayer [Thu, 29 Sep 2011 19:39:08 +0000 (21:39 +0200)]
g723.1: replace loop of normalize_bits( by av_log2()

idea by vitor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723.1: cleanup square_root()
Vitor Sessak [Thu, 29 Sep 2011 19:28:18 +0000 (21:28 +0200)]
g723.1: cleanup square_root()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723.1_ use skip_bits1()
Michael Niedermayer [Thu, 29 Sep 2011 19:24:57 +0000 (21:24 +0200)]
g723.1_ use skip_bits1()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agog723.1: use get_bits1()
Michael Niedermayer [Thu, 29 Sep 2011 19:24:02 +0000 (21:24 +0200)]
g723.1: use get_bits1()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agocelp_math: cleanup ff_dot_product()
Michael Niedermayer [Thu, 29 Sep 2011 19:21:26 +0000 (21:21 +0200)]
celp_math: cleanup ff_dot_product()
based on code & idea by vitor

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agogeneral.texi: we dont have a g729 encoder yet
Michael Niedermayer [Thu, 29 Sep 2011 17:38:51 +0000 (19:38 +0200)]
general.texi: we dont have a g729 encoder yet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoG.723.1 doc and change log entry
Mohamed Naufal Basheer [Thu, 17 Mar 2011 22:56:51 +0000 (23:56 +0100)]
G.723.1 doc and change log entry

12 years agoAdd the G723.1 demuxer and decoder
Mohamed Naufal Basheer [Thu, 17 Mar 2011 22:56:50 +0000 (23:56 +0100)]
Add the G723.1 demuxer and decoder

12 years agoAdd G.723.1 decoder data tables
Mohamed Naufal Basheer [Thu, 17 Mar 2011 22:56:49 +0000 (23:56 +0100)]
Add G.723.1 decoder data tables

12 years agoAdd dot_product function for use by the G.723.1 decoder
Mohamed Naufal Basheer [Thu, 17 Mar 2011 22:56:48 +0000 (23:56 +0100)]
Add dot_product function for use by the G.723.1 decoder

12 years agoAdd a shift parameter to celp_lp_synthesis_filter for reuse by the G.723.1 decoder
Mohamed Naufal Basheer [Thu, 17 Mar 2011 22:56:47 +0000 (23:56 +0100)]
Add a shift parameter to celp_lp_synthesis_filter for reuse by the G.723.1 decoder

12 years agoShow configuration and library version with AV_LOG_INFO.
Carl Eugen Hoyos [Thu, 29 Sep 2011 10:59:05 +0000 (12:59 +0200)]
Show configuration and library version with AV_LOG_INFO.

This partly reverts 1c5e9551bca12e040270e0cd3d71440f83e9f8ae,
a change of behaviour that was not discussed.

The reason for the revert is that FFmpeg cares about bugreports.

12 years agoCheck for unsupported parameters in ff_j2k_dwt_init()
Laurent Aimar [Wed, 28 Sep 2011 23:04:54 +0000 (01:04 +0200)]
Check for unsupported parameters in ff_j2k_dwt_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for out of bound reads in jpeg 2000 decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:53 +0000 (01:04 +0200)]
Check for out of bound reads in jpeg 2000 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoPrevent calling init_vlc() with invalid parameters in motionpixels decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:52 +0000 (01:04 +0200)]
Prevent calling init_vlc() with invalid parameters in motionpixels decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoPrevent NULL dereference when the palette is missing in the xan decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:51 +0000 (01:04 +0200)]
Prevent NULL dereference when the palette is missing in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFixed out of bound accesses in xan_unpack() of the xan decoder.
Laurent Aimar [Wed, 28 Sep 2011 23:04:49 +0000 (01:04 +0200)]
Fixed out of bound accesses in xan_unpack() of the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoswr_test: dont test samples that have not been written
Michael Niedermayer [Thu, 29 Sep 2011 02:52:22 +0000 (04:52 +0200)]
swr_test: dont test samples that have not been written

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 28 Sep 2011 23:03:02 +0000 (01:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (23 commits)
  avconv: Reformat s16 volume adjustment.
  ARM: NEON optimised vector_fmac_scalar()
  dca: use vector_fmac_scalar from dsputil
  dsputil: add vector_fmac_scalar()
  latmenc: Fix private options
  vf_unsharp: store hsub/vsub in the filter context
  vf_unsharp: adopt a more natural order of params in apply_unsharp()
  vf_unsharp: rename method "unsharpen" to "apply_unsharp"
  vf_scale: apply the same transform to the aspect during init that is applied per frame
  vf_pad: fix "vsub" variable value computation
  vf_scale: add a "sar" variable
  lavfi: fix realloc size computation in avfilter_add_format()
  vsrc_color: use internal timebase
  lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
  graphparser: prefer void * over AVClass * for log contexts
  avfiltergraph: use meaningful error codes
  avconv: Initialize return value for codec copy path.
  fate: use 'run' helper for seek-test
  fate: remove seek-mpeg2reuse test
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  ...

Conflicts:
doc/filters.texi
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/vf_scale.c
libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago2/4 bpp png is supported.
Carl Eugen Hoyos [Wed, 28 Sep 2011 20:53:25 +0000 (22:53 +0200)]
2/4 bpp png is supported.

12 years agoh264: fix FIXME and use list_count in ff_h264_fill_mbaff_ref_list()
Michael Niedermayer [Wed, 28 Sep 2011 20:24:05 +0000 (22:24 +0200)]
h264: fix FIXME and use list_count in ff_h264_fill_mbaff_ref_list()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoh264: More correct ref_count check in decode_slice_header()
Michael Niedermayer [Wed, 28 Sep 2011 20:22:56 +0000 (22:22 +0200)]
h264: More correct ref_count check in decode_slice_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agosink_buffer: fix typo
Michael Niedermayer [Wed, 28 Sep 2011 18:30:30 +0000 (20:30 +0200)]
sink_buffer: fix typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavconv: Reformat s16 volume adjustment.
Alex Converse [Tue, 27 Sep 2011 17:24:28 +0000 (10:24 -0700)]
avconv: Reformat s16 volume adjustment.

12 years agoUse "JPEG 2000" as long name for j2k.
Carl Eugen Hoyos [Wed, 28 Sep 2011 16:43:49 +0000 (18:43 +0200)]
Use "JPEG 2000" as long name for j2k.

12 years agoEncoding speex via libspeex is supported.
Carl Eugen Hoyos [Wed, 28 Sep 2011 16:34:07 +0000 (18:34 +0200)]
Encoding speex via libspeex is supported.

12 years agomovenc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
movenc: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agogxfenc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
gxfenc: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoaviobuf: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
aviobuf: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavienc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
avienc: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoavidec: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
avidec: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago4xm: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
4xm: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibvpxenc: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
libvpxenc: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agobitstream: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
bitstream: Replace av_realloc by av_realloc_f when relevant.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: Replace av_realloc by av_realloc_f when relevant.
Nicolas George [Wed, 28 Sep 2011 15:16:11 +0000 (17:16 +0200)]
ffmpeg: Replace av_realloc by av_realloc_f when relevant.

Also mark with a visible comment "FIXME realloc failure" places where
av_realloc seems to lack a proper test for failure.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoIntroduce av_realloc_f.
Nicolas George [Sun, 20 Mar 2011 18:39:20 +0000 (19:39 +0100)]
Introduce av_realloc_f.

av_realloc_f helps avoiding memory-leaks in typical uses of realloc.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoIntroduce av_size_mult.
Nicolas George [Sun, 20 Mar 2011 18:39:20 +0000 (19:39 +0100)]
Introduce av_size_mult.

av_size_mult helps checking for overflow when computing the size of a memory
area.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibx264: remove check_default_settings()
Michael Niedermayer [Wed, 28 Sep 2011 13:11:19 +0000 (15:11 +0200)]
libx264: remove check_default_settings()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffprobe: fix trailing '=' in stream id.
Clément Bœsch [Wed, 28 Sep 2011 15:57:22 +0000 (17:57 +0200)]
ffprobe: fix trailing '=' in stream id.

12 years agolavfi: fix FF_API_* definition macros
Stefano Sabatini [Wed, 28 Sep 2011 13:41:28 +0000 (15:41 +0200)]
lavfi: fix FF_API_* definition macros

Fix ABI break occurred after their use.

Bug reported and patch provided by chinsou, fix trac issue #516,
+80cola for me.

12 years agoARM: NEON optimised vector_fmac_scalar()
Mans Rullgard [Wed, 28 Sep 2011 13:34:54 +0000 (14:34 +0100)]
ARM: NEON optimised vector_fmac_scalar()

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agodca: use vector_fmac_scalar from dsputil
Mans Rullgard [Wed, 28 Sep 2011 13:34:04 +0000 (14:34 +0100)]
dca: use vector_fmac_scalar from dsputil

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agodsputil: add vector_fmac_scalar()
Mans Rullgard [Wed, 28 Sep 2011 13:33:21 +0000 (14:33 +0100)]
dsputil: add vector_fmac_scalar()

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agoswresample: remove unused variable.
Nicolas George [Sun, 25 Sep 2011 11:36:03 +0000 (13:36 +0200)]
swresample: remove unused variable.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibswr/rematrix: remove unused variable.
Nicolas George [Sun, 25 Sep 2011 11:35:03 +0000 (13:35 +0200)]
libswr/rematrix: remove unused variable.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibswr/rematrix: add braces to silence a warning.
Nicolas George [Sun, 25 Sep 2011 11:24:40 +0000 (13:24 +0200)]
libswr/rematrix: add braces to silence a warning.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agobintext: remove unused variable.
Nicolas George [Sun, 25 Sep 2011 11:12:05 +0000 (13:12 +0200)]
bintext: remove unused variable.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovf_boxblur: remove useless code.
Nicolas George [Sun, 25 Sep 2011 11:10:15 +0000 (13:10 +0200)]
vf_boxblur: remove useless code.

This block was probably leftovers from code refactoring.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoj2kdec: use correct printf format.
Nicolas George [Sun, 25 Sep 2011 10:34:05 +0000 (12:34 +0200)]
j2kdec: use correct printf format.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoj2kenc: Fix pointer<->integer casts.
Michael Niedermayer [Wed, 28 Sep 2011 13:18:49 +0000 (15:18 +0200)]
j2kenc: Fix pointer<->integer casts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolatmenc: Fix private options
Kieran Kunhya [Wed, 28 Sep 2011 12:46:10 +0000 (07:46 -0500)]
latmenc: Fix private options

Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agovf_unsharp: store hsub/vsub in the filter context
Stefano Sabatini [Fri, 12 Aug 2011 07:30:17 +0000 (09:30 +0200)]
vf_unsharp: store hsub/vsub in the filter context

Also drop obfuscating CHROMA_WIDTH/HEIGHT macros.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agovf_unsharp: adopt a more natural order of params in apply_unsharp()
Stefano Sabatini [Fri, 12 Aug 2011 07:22:31 +0000 (09:22 +0200)]
vf_unsharp: adopt a more natural order of params in apply_unsharp()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agovf_unsharp: rename method "unsharpen" to "apply_unsharp"
Stefano Sabatini [Fri, 12 Aug 2011 06:47:09 +0000 (08:47 +0200)]
vf_unsharp: rename method "unsharpen" to "apply_unsharp"

More consistent with the original libmpcodecs code, and the name
"unsharpen" was confusing.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agovf_scale: apply the same transform to the aspect during init that is applied per...
Michael Niedermayer [Fri, 26 Aug 2011 23:49:55 +0000 (01:49 +0200)]
vf_scale: apply the same transform to the aspect during init that is applied per frame

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agovf_pad: fix "vsub" variable value computation
Stefano Sabatini [Mon, 4 Jul 2011 09:15:14 +0000 (11:15 +0200)]
vf_pad: fix "vsub" variable value computation

It was shifting 2 rather than 1, +10l.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agovf_scale: add a "sar" variable
Stefano Sabatini [Sat, 2 Jul 2011 15:27:31 +0000 (17:27 +0200)]
vf_scale: add a "sar" variable

Also create a "dar" alias for the "a" variable, for avoiding possible
confusion between dar/sar.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agolavfi: fix realloc size computation in avfilter_add_format()
Stefano Sabatini [Sun, 19 Jun 2011 20:07:18 +0000 (22:07 +0200)]
lavfi: fix realloc size computation in avfilter_add_format()

Replace sizeof((*avff)->formats)
with    sizeof(*(*avff)->formats)

as the size of the array element is given by the pointed element
rather than by its pointer.

In particular fix computation with the pending patch when
sizeof(int64_t) != sizeof(int64_t *).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agovsrc_color: use internal timebase
Stefano Sabatini [Fri, 17 Jun 2011 23:52:40 +0000 (01:52 +0200)]
vsrc_color: use internal timebase

Avoid timescale conversion, simplify.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agolavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
Stefano Sabatini [Sat, 11 Jun 2011 09:41:49 +0000 (11:41 +0200)]
lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

Require "void *" rather than "AVClass *" for the log context type.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agographparser: prefer void * over AVClass * for log contexts
Stefano Sabatini [Sat, 11 Jun 2011 12:33:09 +0000 (14:33 +0200)]
graphparser: prefer void * over AVClass * for log contexts

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agoavfiltergraph: use meaningful error codes
Stefano Sabatini [Sat, 11 Jun 2011 09:15:40 +0000 (11:15 +0200)]
avfiltergraph: use meaningful error codes

Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years agoavconv: Initialize return value for codec copy path.
Alex Converse [Tue, 27 Sep 2011 22:27:18 +0000 (15:27 -0700)]
avconv: Initialize return value for codec copy path.

12 years agoh264: dont set key_frame when the frame is not a real keyframe.
Michael Niedermayer [Wed, 28 Sep 2011 01:47:39 +0000 (03:47 +0200)]
h264: dont set key_frame when the frame is not a real keyframe.
Fixes Ticket514

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agofate: use 'run' helper for seek-test
Mans Rullgard [Wed, 28 Sep 2011 01:13:31 +0000 (02:13 +0100)]
fate: use 'run' helper for seek-test

This is simpler, and the actual seek-test command is printed with V=1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agofate: remove seek-mpeg2reuse test
Mans Rullgard [Wed, 28 Sep 2011 01:11:14 +0000 (02:11 +0100)]
fate: remove seek-mpeg2reuse test

The input file for this test is no longer generated.

Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years agodoc/ffmpeg.texi: merge changes from avconv.texi since last merge
Michael Niedermayer [Wed, 28 Sep 2011 00:57:34 +0000 (02:57 +0200)]
doc/ffmpeg.texi: merge changes from avconv.texi since last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffplay: fix forgotten codec_name checks
Michael Niedermayer [Wed, 28 Sep 2011 01:05:33 +0000 (03:05 +0200)]
ffplay: fix forgotten codec_name checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: fix wrong indention that leaked in from merge
Michael Niedermayer [Wed, 28 Sep 2011 00:11:07 +0000 (02:11 +0200)]
ffmpeg: fix wrong indention that leaked in from merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for out of bound reads in the flic decoder.
Laurent Aimar [Tue, 27 Sep 2011 20:05:15 +0000 (22:05 +0200)]
Check for out of bound reads in the flic decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Sep 2011 23:31:38 +0000 (01:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: use different variables for decoded and filtered frame.
  avconv: add support for copying attachments.
  matroskaenc: write attachments.
  matroskadec: export mimetype of attachments as metadata.
  avconv: factorize common code from new_*_stream()
  doc/avconv: expand documentation for some options.
  doc/avconv: document -timelimit.

Conflicts:
avconv.c
cmdutils.c
tests/codec-regression.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoPrevent out of bound accesses in the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:53:47 +0000 (23:53 +0200)]
Prevent out of bound accesses in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for invalid/corrupted bitstream in sun raster decoder.
Laurent Aimar [Tue, 27 Sep 2011 19:24:03 +0000 (21:24 +0200)]
Check for invalid/corrupted bitstream in sun raster decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoPrevent NULL dereferences when missing the reference frame in the xan decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:57 +0000 (23:43 +0200)]
Prevent NULL dereferences when missing the reference frame in the xan decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for out of bounds reads in sun rasterfile decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:53 +0000 (23:43 +0200)]
Check for out of bounds reads in sun rasterfile decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for corrupted extra data in wmavoice decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:52 +0000 (23:43 +0200)]
Check for corrupted extra data in wmavoice decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoCheck for out of bound writes in the wmavoice decoder.
Laurent Aimar [Tue, 27 Sep 2011 21:43:51 +0000 (23:43 +0200)]
Check for out of bound writes in the wmavoice decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoPrevent NULL dereferences when missing the reference frame in the bink decoder.
Laurent Aimar [Tue, 27 Sep 2011 18:22:13 +0000 (20:22 +0200)]
Prevent NULL dereferences when missing the reference frame in the bink decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoFix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
Michael Niedermayer [Thu, 28 Jul 2011 12:59:54 +0000 (14:59 +0200)]
Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.

Whitespace of the patch cleaned up by Aurel
Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 956c901c68eff78288f40e3c8f41ee2fa081d4a8)

Further suggestions from Kostya <kostya.shishkov@gmail.com> have been
implemented by Reinhard Tartler <siretart@tauware.de>

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
12 years agoavconv: Fix volume adjustment for non-s16 sample formats
Alex Converse [Tue, 27 Sep 2011 17:15:07 +0000 (10:15 -0700)]
avconv: Fix volume adjustment for non-s16 sample formats

12 years agoavconv: Make samples void*.
Alex Converse [Tue, 27 Sep 2011 17:21:39 +0000 (10:21 -0700)]
avconv: Make samples void*.

Different sample formats are different sizes.

12 years agoavconv: Use the size of the decode sample format when allocating the audio samples...
Alex Converse [Tue, 27 Sep 2011 17:20:23 +0000 (10:20 -0700)]
avconv: Use the size of the decode sample format when allocating the audio samples buffer.

12 years agomxf: Add PictureEssenceCoding UL for V210
Tomas Härdin [Mon, 26 Sep 2011 09:24:11 +0000 (11:24 +0200)]
mxf: Add PictureEssenceCoding UL for V210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>