ffmpeg.git
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Jul 2011 22:34:34 +0000 (00:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: make examples build normally

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_pad: add an example employing the sar variable
Stefano Sabatini [Sat, 30 Jul 2011 16:23:24 +0000 (18:23 +0200)]
vf_pad: add an example employing the sar variable

9 years agoffplay: set input link sample aspect ratio in input_config_props()
Stefano Sabatini [Sat, 30 Jul 2011 16:15:08 +0000 (18:15 +0200)]
ffplay: set input link sample aspect ratio in input_config_props()

Allow sample_aspect_ratio information to be correctly propagated in
the filterchain.

9 years agovf_crop: add support for a, dar, sar, hsub, and vsub variables
Stefano Sabatini [Mon, 4 Jul 2011 11:28:37 +0000 (13:28 +0200)]
vf_crop: add support for a, dar, sar, hsub, and vsub variables

Consistent with the pad and scale filters.

9 years agolavfi: tweak display aspect ratio variables in pad and scale filters
Stefano Sabatini [Wed, 27 Jul 2011 08:58:24 +0000 (10:58 +0200)]
lavfi: tweak display aspect ratio variables in pad and scale filters

Previously, "dar" and "a" were documented like "input display aspect
ratio", but their actual value was "in_w/in_h".

In order to avoid to break scripts which rely on the "a" variable, the
patch keeps the same semantics but fixes the corresponding docs, and
fixes the semantics of the recently added "dar" variable, which
now correctly expresses the input Display Aspect Ratio value as
"(inw_w/in_h)*sar".

9 years agobuild: make examples build normally
Luca Barbato [Sat, 30 Jul 2011 09:01:17 +0000 (11:01 +0200)]
build: make examples build normally

The link target was missing $(EXAMPLES)

9 years agoRevert bink dequantization hack that is no longer necessary.
Reimar Döffinger [Sat, 30 Jul 2011 09:22:11 +0000 (11:22 +0200)]
Revert bink dequantization hack that is no longer necessary.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 30 Jul 2011 04:39:57 +0000 (06:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
Alex Converse [Fri, 29 Jul 2011 22:27:36 +0000 (15:27 -0700)]
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.

This prevents out of bounds reads when extradata is being decoded.

9 years agoH.264: tweak some other x86 asm for Atom
Jason Garrett-Glaser [Thu, 28 Jul 2011 01:09:49 +0000 (18:09 -0700)]
H.264: tweak some other x86 asm for Atom

9 years agovf_transpose: avoid multiple calls to avfilter_draw_slice()
Stefano Sabatini [Fri, 29 Jul 2011 18:19:04 +0000 (20:19 +0200)]
vf_transpose: avoid multiple calls to avfilter_draw_slice()

avfilter_draw_slice() is already called in the end_frame() callback,
this avoids multiple calls. This is done by adding a null draw_slice()
callback.

In particular fix crash occurring with -vf transpose=3,hflip, fix trac
issue #371.

9 years agoprobe: Fix insane flow control.
Alex Converse [Fri, 29 Jul 2011 01:53:19 +0000 (18:53 -0700)]
probe: Fix insane flow control.

A loop control variable was shadowed inside the loop and never updated.

9 years agompegts: remove invalid error check
Mike Williams [Thu, 14 Jul 2011 20:49:21 +0000 (16:49 -0400)]
mpegts: remove invalid error check

mpegts_read_header is used by both mpegts and mpegtsraw, so this
erro check is no longer valid.

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agos302m: use nondeprecated audio sample format API
Dustin Brody [Fri, 29 Jul 2011 06:36:11 +0000 (02:36 -0400)]
s302m: use nondeprecated audio sample format API

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavc: use designated initialisers for all codecs.
Anton Khirnov [Sun, 17 Jul 2011 10:54:31 +0000 (12:54 +0200)]
lavc: use designated initialisers for all codecs.

It's more readable and less prone to breakage.

9 years agox86: cabac: add operand size suffixes missing from 6c32576
Mans Rullgard [Fri, 29 Jul 2011 00:55:58 +0000 (01:55 +0100)]
x86: cabac: add operand size suffixes missing from 6c32576

This fixes build with clang.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 28 Jul 2011 23:50:43 +0000 (01:50 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition
  x86: cabac: don't load/store context values in asm
  H.264: optimize CABAC x86 asm for Atom
  vp3/theora: flush after seek.
  doc/fftools-common-opts: wording fixes missing from the previous commit.
  doc: document using AVOptions in fftools.
  cmdutils: add codec_opts parameter to setup_find_stream_info_opts()
  cmdutils: clarify documentation for filter_codec_opts()
  cmdutils: clarify documentation for setup_find_stream_info_opts()
  lavf: add forgotten attribute_deprecated to av_find_stream_info()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with...
Dustin Brody [Wed, 27 Jul 2011 23:09:45 +0000 (19:09 -0400)]
h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agox86: cabac: don't load/store context values in asm
Mans Rullgard [Thu, 28 Jul 2011 19:21:33 +0000 (20:21 +0100)]
x86: cabac: don't load/store context values in asm

Inspection of compiled code shows gcc handles these fine on its own.
Benchmarking also shows no measurable speed difference.

Removing the remaining cases in get_cabac_bypass_sign_x86() does
cause more substantial changes to the compiled code with uncertain
impact.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoH.264: optimize CABAC x86 asm for Atom
Jason Garrett-Glaser [Wed, 27 Jul 2011 02:08:05 +0000 (19:08 -0700)]
H.264: optimize CABAC x86 asm for Atom

9 years agovp3/theora: flush after seek.
Ronald S. Bultje [Tue, 26 Jul 2011 17:58:29 +0000 (10:58 -0700)]
vp3/theora: flush after seek.

9 years agoh264 - Correct implicit weight table computation for long ref pics
Jeff Downs [Wed, 6 Jul 2011 15:54:36 +0000 (11:54 -0400)]
h264 - Correct implicit weight table computation for long ref pics

Correct computation of implicit weight tables when referencing pictures
that are marked for long reference.

9 years agoh264 - correct the check for invalid long term frame index in MMCO decode
Jeff Downs [Tue, 5 Jul 2011 18:21:54 +0000 (14:21 -0400)]
h264 - correct the check for invalid long term frame index in MMCO decode

The current checks on MMCO parameters prohibits a "max long term frame index
plus 1" of 16 (frame idx of 15) for the "set max long term frame index" MMCO.
Fix this off-by-one error to allow the full range of legal values.

9 years agoh264 - Fix PCM intra coded blocks in monochrome case
Jeff Downs [Tue, 5 Jul 2011 17:20:06 +0000 (13:20 -0400)]
h264 - Fix PCM intra coded blocks in monochrome case

9 years agodoc/fftools-common-opts: wording fixes missing from the previous commit.
Anton Khirnov [Thu, 28 Jul 2011 15:43:24 +0000 (17:43 +0200)]
doc/fftools-common-opts: wording fixes missing from the previous commit.

9 years agodoc: document using AVOptions in fftools.
Anton Khirnov [Sun, 17 Jul 2011 12:54:20 +0000 (14:54 +0200)]
doc: document using AVOptions in fftools.

9 years agocmdutils: add codec_opts parameter to setup_find_stream_info_opts()
Stefano Sabatini [Sun, 17 Jul 2011 14:19:28 +0000 (16:19 +0200)]
cmdutils: add codec_opts parameter to setup_find_stream_info_opts()

Avoid brittle and obfuscating reference to a global.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agocmdutils: clarify documentation for filter_codec_opts()
Stefano Sabatini [Sat, 16 Jul 2011 23:20:50 +0000 (01:20 +0200)]
cmdutils: clarify documentation for filter_codec_opts()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agocmdutils: clarify documentation for setup_find_stream_info_opts()
Stefano Sabatini [Sat, 16 Jul 2011 23:30:43 +0000 (01:30 +0200)]
cmdutils: clarify documentation for setup_find_stream_info_opts()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavf: add forgotten attribute_deprecated to av_find_stream_info()
Anton Khirnov [Sun, 17 Jul 2011 11:59:04 +0000 (13:59 +0200)]
lavf: add forgotten attribute_deprecated to av_find_stream_info()

9 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>
9 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>
9 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()

9 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

9 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.

9 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.

9 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.

9 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>
9 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

9 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>
9 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>
9 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>
9 years agocosmetics: reindent
Justin Ruggles [Mon, 25 Jul 2011 16:54:25 +0000 (12:54 -0400)]
cosmetics: reindent

9 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

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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

9 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

9 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.

9 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.

9 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()

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

9 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

9 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>
9 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>
9 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>
9 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

9 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>
9 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>
9 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>
9 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>
9 years agolsws: fix weird indent
Stefano Sabatini [Mon, 25 Jul 2011 11:02:53 +0000 (13:02 +0200)]
lsws: fix weird indent

9 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.

9 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

9 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>
9 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.

9 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>
9 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>
9 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)

9 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()

9 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.

9 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

9 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>
9 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.

9 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.

9 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>
9 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>
9 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.

9 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>
9 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>
9 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.

9 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>
9 years agortp: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:27:46 +0000 (13:27 +0200)]
rtp: remove disabled code

9 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

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>