ffmpeg.git
6 years agoFix several security issues in matroskadec.c (MSVR-11-0080).
Michael Niedermayer [Thu, 28 Jul 2011 12:59:54 +0000 (14:59 +0200)]
Fix several security issues in matroskadec.c (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>
6 years agoh264: improve max slices error message
Michael Niedermayer [Thu, 28 Jul 2011 09:30:44 +0000 (11:30 +0200)]
h264: improve max slices error message

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolsws: apply logging factorization in sws_scale_init()
Stefano Sabatini [Mon, 25 Jul 2011 22:03:50 +0000 (00:03 +0200)]
lsws: apply logging factorization in sws_scale_init()

6 years agoimgconvert: remove unused and inconsistent PixFmtInfo.depth field
Stefano Sabatini [Mon, 25 Jul 2011 09:47:32 +0000 (11:47 +0200)]
imgconvert: remove unused and inconsistent PixFmtInfo.depth field

6 years agoprefer "SAR" over "PAR" in av_dump_format()
Stefano Sabatini [Wed, 27 Jul 2011 08:35:08 +0000 (10:35 +0200)]
prefer "SAR" over "PAR" in av_dump_format()

"SAR" (Sample Aspect Ratio) is globally preferred over "PAR" (Pixel
Aspect Ratio), although the two terms share the same semantics.

For example the corresponding AVStream field is called
sample_aspect_ratio, and libavfilter has a filter named setsar.

Therefore prefer the term "SAR" over "PAR" in the
libavformat/utils.c:dump_stream_format() and avcodec_string() output
for avoiding confusion.

6 years agolavfi-showfiltfmts: extend output format for specifying audio data
Stefano Sabatini [Sat, 16 Jul 2011 19:29:05 +0000 (21:29 +0200)]
lavfi-showfiltfmts: extend output format for specifying audio data

This is required for extending lavfi tests to audio filtering.

6 years agoaudioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK
Stefano Sabatini [Wed, 27 Jul 2011 16:41:09 +0000 (18:41 +0200)]
audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK

Previously the string for AV_CH_LAYOUT_5POINT{0,1}_BACK was the same
of the string for AV_CH_LAYOUT_5POINT{0,1}.

This is required for discerning the two channel layouts, given a
channel layout string.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 28 Jul 2011 07:27:28 +0000 (09:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: remove redundant setting of Altivec IDCT
  mpegvideo: initialise DSPContext in ff_dct_common_init()
  cosmetics: reindent
  eac3enc: support writing of basic mixing and info metadata
  dnxhdenc: fix declarations in for loops
  dsputil: remove stale bink prototypes and comments
  dsputil: move a bink-only function to binkdsp
  dsputil: remove some unused functions
  bink: make IDCT take 32-bit input

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoyadif must copy buffer properties like aspect for second frame as well
Joakim Plate [Thu, 14 Jul 2011 20:31:37 +0000 (22:31 +0200)]
yadif must copy buffer properties like aspect for second frame as well

6 years agoRemove libx264 baseline ffpreset
Lou Logan [Mon, 11 Jul 2011 20:34:08 +0000 (12:34 -0800)]
Remove libx264 baseline ffpreset

Made redundant by "-profile baseline".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoppc: remove redundant setting of Altivec IDCT
Mans Rullgard [Mon, 25 Jul 2011 15:18:17 +0000 (16:18 +0100)]
ppc: remove redundant setting of Altivec IDCT

This is already set by dsputil_init_ppc() and is best done in only
one place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agompegvideo: initialise DSPContext in ff_dct_common_init()
Mans Rullgard [Mon, 25 Jul 2011 14:51:36 +0000 (15:51 +0100)]
mpegvideo: initialise DSPContext in ff_dct_common_init()

The functions and tables initialised in this function rely on an
initialised DSPContext.  Make sure they always have one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agocosmetics: reindent
Justin Ruggles [Mon, 25 Jul 2011 16:54:25 +0000 (12:54 -0400)]
cosmetics: reindent

6 years agoeac3enc: support writing of basic mixing and info metadata
Justin Ruggles [Sun, 29 May 2011 23:16:46 +0000 (19:16 -0400)]
eac3enc: support writing of basic mixing and info metadata

6 years agodnxhdenc: fix declarations in for loops
Mans Rullgard [Wed, 27 Jul 2011 15:14:33 +0000 (16:14 +0100)]
dnxhdenc: fix declarations in for loops

Apparently the gcc warning doesn't trigger on these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputil: remove stale bink prototypes and comments
Mans Rullgard [Wed, 27 Jul 2011 14:49:03 +0000 (15:49 +0100)]
dsputil: remove stale bink prototypes and comments

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputil: move a bink-only function to binkdsp
Mans Rullgard [Wed, 27 Jul 2011 14:47:02 +0000 (15:47 +0100)]
dsputil: move a bink-only function to binkdsp

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputil: remove some unused functions
Mans Rullgard [Wed, 27 Jul 2011 13:47:56 +0000 (14:47 +0100)]
dsputil: remove some unused functions

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agobink: make IDCT take 32-bit input
Kostya Shishkov [Sat, 23 Jul 2011 13:46:35 +0000 (15:46 +0200)]
bink: make IDCT take 32-bit input

Since IDCT transforming 32-bit input to 8-bit output is unusual and unpractical
for most codecs, move Bink IDCT into separate context. Get rid of an additional
permutation table while at it since SIMD support for Bink IDCT is unlikely to
be implemented in foreseeable future.
Quantisation tables also have to change type to signed for proper
dequantisation of DCT coefficients.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 27 Jul 2011 08:40:34 +0000 (10:40 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: spelling cosmetics
  dctref: make sure function declarations match between .c and .h file
  x86: fix build with gcc 4.7

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/muxing.c: apply misc style fixes
Stefano Sabatini [Wed, 27 Jul 2011 00:04:53 +0000 (02:04 +0200)]
examples/muxing.c: apply misc style fixes

6 years agoexamples/muxing.c: fix typo, futur -> future
Stefano Sabatini [Wed, 27 Jul 2011 00:01:14 +0000 (02:01 +0200)]
examples/muxing.c: fix typo, futur -> future

6 years agoimgconvert: change logic in avcodec_get_pix_fmt_loss()
Stefano Sabatini [Sun, 24 Jul 2011 13:38:59 +0000 (15:38 +0200)]
imgconvert: change logic in avcodec_get_pix_fmt_loss()

Avoid the use of the brittle/inconsistent information in
PixFmtInfo.depth, and implement a possibly more robust logic which
exposes the information in pixdesc.

Also allow the removal of PixFmtInfo.depth, since this is the only use
of it.

6 years agolsws: remove redundant macros isSupportedIn/Out
Stefano Sabatini [Mon, 25 Jul 2011 11:04:11 +0000 (13:04 +0200)]
lsws: remove redundant macros isSupportedIn/Out

Directly call sws_isSupportedInput/Output.

6 years agolsws: factorize some logging code in sws_init_context()
Stefano Sabatini [Mon, 25 Jul 2011 12:09:55 +0000 (14:09 +0200)]
lsws: factorize some logging code in sws_init_context()

6 years agoconfigure: spelling cosmetics
Diego Biurrun [Wed, 13 Jul 2011 16:12:43 +0000 (18:12 +0200)]
configure: spelling cosmetics

6 years agodctref: make sure function declarations match between .c and .h file
Diego Biurrun [Wed, 13 Jul 2011 22:00:43 +0000 (00:00 +0200)]
dctref: make sure function declarations match between .c and .h file

6 years agox86: fix build with gcc 4.7
Mans Rullgard [Tue, 26 Jul 2011 11:23:43 +0000 (12:23 +0100)]
x86: fix build with gcc 4.7

The upcoming gcc 4.7 has more advanced constant propagation
resulting some inline asm operands becoming constants and thus
emitted as literals, sometimes in contexts where this results
in invalid instructions.

This patch changes the constraints of the relevant operands
to "rm" thus forcing a valid type.  While obviously suboptimal,
this is what older gcc versions already did, and there is no
change to the code generated with these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoRemove useless NULL check.
Reimar Döffinger [Tue, 26 Jul 2011 20:28:26 +0000 (22:28 +0200)]
Remove useless NULL check.

We dereferenced the pointer two lines above, no point in
checking for NULL afterwards.
In addition it cannot be NULL the way it was initialized
just one line further above.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 26 Jul 2011 13:37:11 +0000 (15:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ape: adjust some printf format strings to correctly match argument types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoape: adjust some printf format strings to correctly match argument types
Diego Biurrun [Wed, 1 Jun 2011 13:06:08 +0000 (15:06 +0200)]
ape: adjust some printf format strings to correctly match argument types

6 years agomuxer opts: fix avdict use in case of early private context alloc
Michael Niedermayer [Mon, 25 Jul 2011 20:25:24 +0000 (22:25 +0200)]
muxer opts: fix avdict use in case of early private context alloc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: better timebase guessing for stream copy
Michael Niedermayer [Mon, 25 Jul 2011 18:48:55 +0000 (20:48 +0200)]
ffmpeg: better timebase guessing for stream copy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortp: disable udp fifos, the rtp code cannot work with the fifos in its current form...
Michael Niedermayer [Mon, 25 Jul 2011 13:50:56 +0000 (15:50 +0200)]
rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoudp: allow fifo size to be tuned seperately
Michael Niedermayer [Mon, 25 Jul 2011 13:50:13 +0000 (15:50 +0200)]
udp: allow fifo size to be tuned seperately

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolsws: fix weird indent
Stefano Sabatini [Mon, 25 Jul 2011 11:02:53 +0000 (13:02 +0200)]
lsws: fix weird indent

6 years agoimgconvert: remove PixFmtInfo.pixel_type field
Stefano Sabatini [Sat, 23 Jul 2011 13:37:05 +0000 (15:37 +0200)]
imgconvert: remove PixFmtInfo.pixel_type field

The field is only used for checking if a format is YUV planar
and if the format is paletted.

This patch replaces the current is_planar_yuv() code with a function
which uses the pixdesc information. The new implementation is less
efficient, but this should not be an issue as the functions which use
it (av_picture_crop/pad()) are deprecated and currently never used in
the codebase.

6 years agolsws: use array for storing the supported in/out information
Stefano Sabatini [Sun, 24 Jul 2011 00:36:02 +0000 (02:36 +0200)]
lsws: use array for storing the supported in/out information

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 24 Jul 2011 23:19:09 +0000 (01:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  jpegdec: actually search for and parse RSTn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUse little endian for caf codec tags.
Carl Eugen Hoyos [Sun, 24 Jul 2011 21:52:42 +0000 (23:52 +0200)]
Use little endian for caf codec tags.

6 years agompeg4_decode_profile_level: fix indention
Michael Niedermayer [Sun, 24 Jul 2011 14:22:18 +0000 (16:22 +0200)]
mpeg4_decode_profile_level: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4videodec: simplify mpeg4_decode_profile_level()
Michael Niedermayer [Sun, 24 Jul 2011 14:21:37 +0000 (16:21 +0200)]
mpeg4videodec: simplify mpeg4_decode_profile_level()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpegdec: actually search for and parse RSTn
Michael Niedermayer [Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)]
jpegdec: actually search for and parse RSTn

Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".

References:
http://trac.videolan.org/vlc/ticket/4215
http://ffmpeg.org/trac/ffmpeg/ticket/267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Kostya <kostya.shishkov@gmail.com>
(cherry picked from commit 7b8ed831eb8432d202dad16dedc1758b018bb1fa)

6 years agoparseutils: add some documentation for small_strptime()
Stefano Sabatini [Tue, 19 Jul 2011 10:01:48 +0000 (12:01 +0200)]
parseutils: add some documentation for small_strptime()

6 years agoimgconvert: store padded size information in PixFmtInfo, simplify avg_bits_per_pixel()
Stefano Sabatini [Tue, 19 Jul 2011 13:38:53 +0000 (15:38 +0200)]
imgconvert: store padded size information in PixFmtInfo, simplify avg_bits_per_pixel()

Prefer data-driven over procedural logic in avg_bits_per_pixel(),
simplify and improve robustness, as it is easy to miss a function
update when a new format is added.

6 years agoimgconvert: remove useless PixFmtInfo.nb_channels field
Stefano Sabatini [Tue, 19 Jul 2011 12:16:04 +0000 (14:16 +0200)]
imgconvert: remove useless PixFmtInfo.nb_channels field

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 23 Jul 2011 14:47:10 +0000 (16:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dnxhddec: avoid a branch in 10-bit decode_dct_block()
  H.264: Add optimizations to predict x86 assembly.
  riff: Add mpgv MPEG-2 fourcc
  add Flash Screen Video 2 decoder

Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_mp: remove blackframe filter wrapper
Stefano Sabatini [Sun, 17 Jul 2011 15:07:39 +0000 (17:07 +0200)]
vf_mp: remove blackframe filter wrapper

blackframe is integrated as a native filter.

6 years agoexamples/encoding.c: adopt a less restrictive license
Stefano Sabatini [Sat, 9 Jul 2011 13:38:23 +0000 (15:38 +0200)]
examples/encoding.c: adopt a less restrictive license

Adopt ISC (Internet Systems Consortium) license in place of LGPL,
consistent with the other examples.

Fabrice explicitely approved the relicensing.

6 years agodnxhddec: avoid a branch in 10-bit decode_dct_block()
Mans Rullgard [Thu, 21 Jul 2011 23:13:27 +0000 (00:13 +0100)]
dnxhddec: avoid a branch in 10-bit decode_dct_block()

The minimum weight value is 32 so this test can be skipped for the
10-bit case.  Overall speedup 3-4%.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoH.264: Add optimizations to predict x86 assembly.
Daniel Kang [Fri, 22 Jul 2011 01:15:58 +0000 (21:15 -0400)]
H.264: Add optimizations to predict x86 assembly.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agoriff: Add mpgv MPEG-2 fourcc
Alex Converse [Fri, 22 Jul 2011 17:13:22 +0000 (10:13 -0700)]
riff: Add mpgv MPEG-2 fourcc

Supported by mplayer and seen in the wild.

6 years agoadd Flash Screen Video 2 decoder
Kostya Shishkov [Sat, 16 Jul 2011 10:02:55 +0000 (12:02 +0200)]
add Flash Screen Video 2 decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 22 Jul 2011 09:56:53 +0000 (11:56 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dnxhddec: optimise dnxhd_decode_dct_block()
  rtp: remove disabled code
  eac3enc: use different numbers of blocks per frame to allow higher bitrates
  dnxhd: add regression test for 10-bit
  dnxhd: 10-bit support
  dsputil: update per-arch init funcs for non-h264 high bit depth
  dsputil: template get_pixels() for different bit depths
  dsputil: create 16/32-bit dctcoef versions of some functions
  jfdctint: add 10-bit version
  mov: add clcp type track as Subtitle stream.
  mpeg4: add Mpeg4 Profiles names.
  mpeg4: decode Level Profile for MPEG4 Part 2.
  ffprobe: display bitstream level.
  imgconvert: remove unused glue and xglue macros

Conflicts:
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoversion.sh: handle shallow clones and snapshots.
Nicolas George [Thu, 21 Jul 2011 13:16:12 +0000 (15:16 +0200)]
version.sh: handle shallow clones and snapshots.

Shallow clones (--depth X) lack the N tag used to compute
the revision number: use 'git-YYYY-MM-DD-hhhhhhh' as revision,
where hhhhhhh is the short git hash.

Snapshots from gitweb do not have git information at all,
but they have the short git hash in the directory name:
append it to the release number.

6 years agodnxhddec: optimise dnxhd_decode_dct_block()
Mans Rullgard [Thu, 21 Jul 2011 18:04:37 +0000 (19:04 +0100)]
dnxhddec: optimise dnxhd_decode_dct_block()

Template the function for 8/10-bit and use lowlevel bitstream
macros.

6% faster overall on i7 gcc 4.5.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agortp: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:27:46 +0000 (13:27 +0200)]
rtp: remove disabled code

6 years agoeac3enc: use different numbers of blocks per frame to allow higher bitrates
Justin Ruggles [Thu, 14 Jul 2011 17:02:45 +0000 (13:02 -0400)]
eac3enc: use different numbers of blocks per frame to allow higher bitrates

6 years agodnxhd: add regression test for 10-bit
Mans Rullgard [Wed, 20 Jul 2011 23:55:24 +0000 (00:55 +0100)]
dnxhd: add regression test for 10-bit

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodnxhd: 10-bit support
Joseph Artsimovich [Wed, 20 Jul 2011 17:58:27 +0000 (18:58 +0100)]
dnxhd: 10-bit support

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputil: update per-arch init funcs for non-h264 high bit depth
Mans Rullgard [Thu, 21 Jul 2011 09:05:15 +0000 (10:05 +0100)]
dsputil: update per-arch init funcs for non-h264 high bit depth

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputil: template get_pixels() for different bit depths
Mans Rullgard [Thu, 21 Jul 2011 01:31:57 +0000 (02:31 +0100)]
dsputil: template get_pixels() for different bit depths

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputil: create 16/32-bit dctcoef versions of some functions
Mans Rullgard [Thu, 21 Jul 2011 11:39:41 +0000 (12:39 +0100)]
dsputil: create 16/32-bit dctcoef versions of some functions

High bitdepth H.264 needs 32-bit transform coefficients, whereas
dnxhd does not.  This creates a conflict with the templated
functions operating on DCTELEM data.  This patch adds a field
allowing the caller to choose the element size in dsputil_init()
and adds the required functions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agojfdctint: add 10-bit version
Mans Rullgard [Wed, 20 Jul 2011 19:01:56 +0000 (20:01 +0100)]
jfdctint: add 10-bit version

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agomov: add clcp type track as Subtitle stream.
Thierry Foucu [Thu, 21 Jul 2011 03:33:25 +0000 (20:33 -0700)]
mov: add clcp type track as Subtitle stream.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agompeg4: add Mpeg4 Profiles names.
Thierry Foucu [Thu, 21 Jul 2011 03:33:24 +0000 (20:33 -0700)]
mpeg4: add Mpeg4 Profiles names.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agompeg4: decode Level Profile for MPEG4 Part 2.
Thierry Foucu [Thu, 21 Jul 2011 03:33:23 +0000 (20:33 -0700)]
mpeg4: decode Level Profile for MPEG4 Part 2.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agoffprobe: display bitstream level.
Thierry Foucu [Thu, 21 Jul 2011 03:33:22 +0000 (20:33 -0700)]
ffprobe: display bitstream level.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agoimgconvert: remove unused glue and xglue macros
Stefano Sabatini [Tue, 19 Jul 2011 12:23:47 +0000 (14:23 +0200)]
imgconvert: remove unused glue and xglue macros

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoh264: fix h264-test
Michael Niedermayer [Thu, 21 Jul 2011 14:50:00 +0000 (16:50 +0200)]
h264: fix h264-test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 21 Jul 2011 14:27:55 +0000 (16:27 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rv30: return AVERROR(EINVAL) instead of EINVAL
  build: add -L flags before existing LDFLAGS
  simple_idct: whitespace cosmetics
  simple_idct: make repeated code a macro
  dsputil: remove huge #if 0 block
  simple_idct: change 10-bit add/put stride from pixels to bytes
  dsputil: allow 9/10-bit functions for non-h264 codecs
  dnxhd: rename some data tables
  dnxhdenc: remove inline from function only called through pointer
  dnxhdenc: whitespace cosmetics
  swscale: mark YUV422P10(LE,BE) as supported for output
  configure: add -xc99 to LDFLAGS for Sun CC
  Remove unused and non-compiling vestigial g729 decoder
  Remove unused code under G729_BITEXACT #ifdef.
  mpegvideo: fix invalid picture unreferencing.
  dsputil: Remove extra blank line at end.
  dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
  simple_idct: add 10-bit version

Conflicts:
Makefile
libavcodec/g729data.h
libavcodec/g729dec.c
libavcodec/rv30.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorv30: return AVERROR(EINVAL) instead of EINVAL
Diego Biurrun [Thu, 21 Jul 2011 12:25:01 +0000 (14:25 +0200)]
rv30: return AVERROR(EINVAL) instead of EINVAL

On some platforms EINVAL could be positive, ensure we return negative values.

6 years agobuild: add -L flags before existing LDFLAGS
Mans Rullgard [Wed, 13 Jul 2011 17:17:54 +0000 (18:17 +0100)]
build: add -L flags before existing LDFLAGS

This ensures the linker picks the just built libraries even
if LDFLAGS for some reason contains -L flags pointing at
other directories containing libav libraries.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agosimple_idct: whitespace cosmetics
Mans Rullgard [Thu, 21 Jul 2011 08:49:17 +0000 (09:49 +0100)]
simple_idct: whitespace cosmetics

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agosimple_idct: make repeated code a macro
Mans Rullgard [Thu, 21 Jul 2011 08:48:29 +0000 (09:48 +0100)]
simple_idct: make repeated code a macro

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agovf_mp: remove cropdetect wrapper
Stefano Sabatini [Sun, 17 Jul 2011 15:39:05 +0000 (17:39 +0200)]
vf_mp: remove cropdetect wrapper

The cropdetect filter is natively integrated into libavfilter.

6 years agovf_blackframe: port missing features from libmpcodecs blackframe
Stefano Sabatini [Sun, 17 Jul 2011 15:05:14 +0000 (17:05 +0200)]
vf_blackframe: port missing features from libmpcodecs blackframe

Use and show picref->video->pict_type and key_frame information.
The pict_type and key_frame information was not available at the time
of the port.

6 years agoau: reuse the result of the previous call to av_get_bits_per_sample()
Stefano Sabatini [Mon, 18 Jul 2011 12:02:07 +0000 (14:02 +0200)]
au: reuse the result of the previous call to av_get_bits_per_sample()

Avoid an unnecessary call to the function, slighlty more
robust/readable.

6 years agodsputil: remove huge #if 0 block
Mans Rullgard [Thu, 21 Jul 2011 09:58:56 +0000 (10:58 +0100)]
dsputil: remove huge #if 0 block

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolibavfilter: fix --enable-small
Michael Niedermayer [Thu, 21 Jul 2011 09:00:47 +0000 (11:00 +0200)]
libavfilter: fix --enable-small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosimple_idct: change 10-bit add/put stride from pixels to bytes
Mans Rullgard [Thu, 21 Jul 2011 02:56:44 +0000 (03:56 +0100)]
simple_idct: change 10-bit add/put stride from pixels to bytes

This matches other dsputil functions and simplifies calls.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodsputil: allow 9/10-bit functions for non-h264 codecs
Mans Rullgard [Thu, 21 Jul 2011 01:21:14 +0000 (02:21 +0100)]
dsputil: allow 9/10-bit functions for non-h264 codecs

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodnxhd: rename some data tables
Joseph Artsimovich [Mon, 18 Jul 2011 10:21:33 +0000 (11:21 +0100)]
dnxhd: rename some data tables

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodnxhdenc: remove inline from function only called through pointer
Mans Rullgard [Wed, 20 Jul 2011 17:41:37 +0000 (18:41 +0100)]
dnxhdenc: remove inline from function only called through pointer

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodnxhdenc: whitespace cosmetics
Mans Rullgard [Wed, 20 Jul 2011 17:38:37 +0000 (18:38 +0100)]
dnxhdenc: whitespace cosmetics

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoswscale: mark YUV422P10(LE,BE) as supported for output
Joseph Artsimovich [Mon, 18 Jul 2011 10:22:15 +0000 (11:22 +0100)]
swscale: mark YUV422P10(LE,BE) as supported for output

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: add -xc99 to LDFLAGS for Sun CC
Sean McGovern [Wed, 20 Jul 2011 21:25:41 +0000 (17:25 -0400)]
configure: add -xc99 to LDFLAGS for Sun CC

Using Sun's compiler on Solaris, -xc99 is as much a linker flag as a
compiler flag, so add it to LDFLAGS.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoRemove unused and non-compiling vestigial g729 decoder
Diego Biurrun [Fri, 15 Jul 2011 00:37:33 +0000 (02:37 +0200)]
Remove unused and non-compiling vestigial g729 decoder

6 years agoRemove unused code under G729_BITEXACT #ifdef.
Diego Biurrun [Wed, 20 Jul 2011 16:37:15 +0000 (18:37 +0200)]
Remove unused code under G729_BITEXACT #ifdef.

G729_BITEXACT is never set, so the code is all dead code.

6 years agompegvideo: fix invalid picture unreferencing.
Ronald S. Bultje [Wed, 20 Jul 2011 16:24:07 +0000 (09:24 -0700)]
mpegvideo: fix invalid picture unreferencing.

Mpegvideo would free frames as soon as they're not the next or prev
picture. This is fine for a single-threading model, but fails miserably
in a system where pictures can be referenced (as e.g. last/prev pic)
in other threads. Keeping track of ownership of pictures keeps image
references (e.g. motion vectors, or the reference of a motion vector)
alive as long as the picture data itself is alive.

This also happens to fix make THREADS=[3-16] fate-vsynth[12]-error.

6 years agodsputil: Remove extra blank line at end.
Alex Converse [Tue, 19 Jul 2011 00:49:23 +0000 (17:49 -0700)]
dsputil: Remove extra blank line at end.

6 years agodsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
Alex Converse [Tue, 19 Jul 2011 00:48:45 +0000 (17:48 -0700)]
dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.

6 years agosimple_idct: add 10-bit version
Mans Rullgard [Wed, 20 Jul 2011 15:05:05 +0000 (16:05 +0100)]
simple_idct: add 10-bit version

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 20 Jul 2011 16:20:05 +0000 (18:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove h264_lowres_idct_put/add functions
  Remove snow/dwt test program
  h264: remove some disabled code
  Fix incorrect max_lowres values
  matroskadec: fix integer underflow if header length < probe length.
  cosmetics: indentation
  eac3enc: use frame exponent strategy when applicable.
  cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
  dsputil: fix ff_check_alignment()

Conflicts:
libavcodec/Makefile
libavcodec/h264idct_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRemove h264_lowres_idct_put/add functions
Mans Rullgard [Wed, 20 Jul 2011 08:46:18 +0000 (09:46 +0100)]
Remove h264_lowres_idct_put/add functions

Use of these has been broken ever since the h264 idct was changed
to always use transposed inputs.  Furthermore, they were only
ever used if some *other* non-default idct was requested.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoRemove snow/dwt test program
Mans Rullgard [Sun, 17 Jul 2011 19:43:15 +0000 (20:43 +0100)]
Remove snow/dwt test program

This test program so full of programming errors it is impossible
to make sense of it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoh264: remove some disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:09:04 +0000 (13:09 +0200)]
h264: remove some disabled code

6 years agoFix incorrect max_lowres values
Mans Rullgard [Wed, 20 Jul 2011 08:55:48 +0000 (09:55 +0100)]
Fix incorrect max_lowres values

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agomatroskadec: fix integer underflow if header length < probe length.
Chris Evans [Wed, 20 Jul 2011 00:51:48 +0000 (17:51 -0700)]
matroskadec: fix integer underflow if header length < probe length.

This fixes a crash with specifically crafted files.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agolibx264.c: distinguish between x264 parameter errors.
Erik Slagter [Mon, 18 Jul 2011 18:04:15 +0000 (20:04 +0200)]
libx264.c: distinguish between x264 parameter errors.

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