ffmpeg.git
6 years agoconfigure: fix print_config() with broke awks
Mans Rullgard [Tue, 30 Oct 2012 11:57:30 +0000 (11:57 +0000)]
configure: fix print_config() with broke awks

Some awk versions do not treat the result of unary + on a (numeric)
string as numeric, giving wrong results when used in a boolean context
Using unary - instead is logically equivalent works as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoswscale.c:remove fill_plane9or10() use fillPlane16()
Michael Niedermayer [Tue, 30 Oct 2012 17:40:55 +0000 (18:40 +0100)]
swscale.c:remove fill_plane9or10() use fillPlane16()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: move fillPlane16() to header so it can be used from more than 1 place
Michael Niedermayer [Tue, 30 Oct 2012 17:39:44 +0000 (18:39 +0100)]
sws: move fillPlane16() to header so it can be used from more than 1 place

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws_unscaled: drop fill_plane9or10()
Michael Niedermayer [Tue, 30 Oct 2012 17:25:05 +0000 (18:25 +0100)]
sws_unscaled: drop fill_plane9or10()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChange my GPG fingerprint
Tomas Härdin [Mon, 29 Oct 2012 09:30:32 +0000 (10:30 +0100)]
Change my GPG fingerprint

The old key expired

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: fix BE/LE handling for fillPlane16()
Michael Niedermayer [Tue, 30 Oct 2012 17:11:52 +0000 (18:11 +0100)]
sws: fix BE/LE handling for fillPlane16()

Based on fill_plane9or10() by luca barbato

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 30 Oct 2012 16:41:17 +0000 (17:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pixfmt: support more yuva formats
  swscale: support gray to 9bit and 10bit formats
  configure: rewrite print_config() function using awk
  FATE: fix (AD)PCM test dependencies broken in e519990
  Use ptrdiff_t instead of int for intra pred "stride" function parameter.
  x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.

Conflicts:
libavcodec/h264pred.c
libavcodec/h264pred_template.c
libavutil/pixfmt.h
libswscale/swscale_unscaled.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 agolavfi: remove palette libmpcodecs wrapper
Paul B Mahol [Fri, 26 Oct 2012 17:59:40 +0000 (17:59 +0000)]
lavfi: remove palette libmpcodecs wrapper

The filter is useless, swscale should be used instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoff: fix case where image does not have alpha channel
Paul B Mahol [Tue, 30 Oct 2012 15:28:13 +0000 (15:28 +0000)]
ff: fix case where image does not have alpha channel

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '08b028c18dc31b6de741861b9555669dcca4d12a'
Michael Niedermayer [Tue, 30 Oct 2012 14:22:13 +0000 (15:22 +0100)]
Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'

* commit '08b028c18dc31b6de741861b9555669dcca4d12a':
  Remove INIT_AVX from x86inc.asm.
  Remove usage of INIT_AVX in h264_intrapred_10bit.asm.
  dv: fix indentation

Conflicts:
libavformat/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'
Michael Niedermayer [Tue, 30 Oct 2012 13:40:22 +0000 (14:40 +0100)]
Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'

* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8':
  dv: use AVStream.index instead of abusing AVStream.id
  lavfi: add ashowinfo filter
  avcodec: Add a RFC 3389 comfort noise codec
  lpc: Add a function for calculating reflection coefficients from samples
  lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients
  lavr: document upper bound on number of output samples.
  lavr: add general API usage doxy
  indeo3: remove duplicate capabilities line.
  fate: ac3: Add dependencies

Conflicts:
Changelog
doc/filters.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/af_ashowinfo.c
libavfilter/allfilters.c
libavfilter/version.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '381dc1a5ec0925b281c573457c413ae643567086'
Michael Niedermayer [Tue, 30 Oct 2012 12:45:44 +0000 (13:45 +0100)]
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

* commit '381dc1a5ec0925b281c573457c413ae643567086':
  fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
  fate: Add shorthands for acodec PCM and ADPCM tests
  avconv: Drop unused function argument from do_video_stats()
  cmdutils: Conditionally compile libswscale-related bits
  aacenc: Drop some unused function arguments
  rtsp: Avoid a cast when calling strtol
  nut: support textual data
  nutenc: verbosely report unsupported negative pts

Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agorawdec: check avpicture_get_size() return value
Michael Niedermayer [Tue, 30 Oct 2012 03:35:38 +0000 (04:35 +0100)]
rawdec: check avpicture_get_size() return value

Fixes CID205019
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoPartly revert f174fba: yop decoder does not support direct rendering.
Carl Eugen Hoyos [Tue, 30 Oct 2012 11:09:25 +0000 (12:09 +0100)]
Partly revert f174fba: yop decoder does not support direct rendering.

6 years agopixfmt: support more yuva formats
Luca Barbato [Sun, 14 Oct 2012 06:06:27 +0000 (08:06 +0200)]
pixfmt: support more yuva formats

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoswscale: support gray to 9bit and 10bit formats
Luca Barbato [Mon, 29 Oct 2012 18:07:01 +0000 (19:07 +0100)]
swscale: support gray to 9bit and 10bit formats

With the input of Kostya and Ronald.

6 years agoPartly revert f174fba: indeo3 decoder does not support direct rendering.
Carl Eugen Hoyos [Tue, 30 Oct 2012 10:51:58 +0000 (11:51 +0100)]
Partly revert f174fba: indeo3 decoder does not support direct rendering.

6 years agoconfigure: rewrite print_config() function using awk
Mans Rullgard [Sat, 27 Oct 2012 15:43:12 +0000 (16:43 +0100)]
configure: rewrite print_config() function using awk

This is much faster with slow shells and noticeably faster even
with bash on a fast Linux system.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agovqavideo: return more meaningful error codes
Paul B Mahol [Tue, 30 Oct 2012 03:28:05 +0000 (03:28 +0000)]
vqavideo: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoFATE: fix (AD)PCM test dependencies broken in e519990
Anton Khirnov [Mon, 29 Oct 2012 20:26:46 +0000 (21:26 +0100)]
FATE: fix (AD)PCM test dependencies broken in e519990

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agompeg12videodec: dont pass mpeg1 VBR special case value on as bitrate.
Michael Niedermayer [Tue, 30 Oct 2012 01:27:50 +0000 (02:27 +0100)]
mpeg12videodec: dont pass mpeg1 VBR special case value on as bitrate.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12video_parser: Wrong bit rate in MPEG2 video file (Ticket #1862)
Heesuk Jung [Tue, 30 Oct 2012 01:07:40 +0000 (02:07 +0100)]
mpeg12video_parser: Wrong bit rate in MPEG2 video file (Ticket #1862)

mpegvideo parser sometime get wrong stream bit rate which is 0x3FFFF*400.
But maximum bit rate of MPEG2 video is up to 80 Mbps in case 1920x1080 resolution.
When bit rate is 0x3FFFF*400, set bit rate zero.

* Problematic link
https://docs.google.com/open?id=0B6r7ZfWFIypCUkhPa0dyTGdFSE0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12parser: cleanup bitrate parsing.
Michael Niedermayer [Tue, 30 Oct 2012 01:05:56 +0000 (02:05 +0100)]
mpeg12parser: cleanup bitrate parsing.

This fixes several bugs in the code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUse ptrdiff_t instead of int for intra pred "stride" function parameter.
Ronald S. Bultje [Mon, 29 Oct 2012 03:44:54 +0000 (20:44 -0700)]
Use ptrdiff_t instead of int for intra pred "stride" function parameter.

This way, SIMD-optimized functions don't have to sign-extend their
stride argument manually to be able to do pointer arithmetic.

6 years agox86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.
Ronald S. Bultje [Mon, 29 Oct 2012 03:44:53 +0000 (20:44 -0700)]
x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes.

6 years agoRemove INIT_AVX from x86inc.asm.
Ronald S. Bultje [Mon, 29 Oct 2012 01:39:23 +0000 (18:39 -0700)]
Remove INIT_AVX from x86inc.asm.

6 years agox11grab: fix mixed declaration and code
Michael Niedermayer [Mon, 29 Oct 2012 21:24:10 +0000 (22:24 +0100)]
x11grab: fix mixed declaration and code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotree: fix type used for testing the tree
Michael Niedermayer [Mon, 29 Oct 2012 21:21:25 +0000 (22:21 +0100)]
tree: fix type used for testing the tree

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqt-faststart: fix signedness of variable used to hold return code
Michael Niedermayer [Mon, 29 Oct 2012 21:05:33 +0000 (22:05 +0100)]
qt-faststart: fix signedness of variable used to hold return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: remove unused variable
Michael Niedermayer [Mon, 29 Oct 2012 20:59:32 +0000 (21:59 +0100)]
mp3dec: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion2: remove unused variable
Michael Niedermayer [Mon, 29 Oct 2012 21:01:22 +0000 (22:01 +0100)]
truemotion2: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRemove usage of INIT_AVX in h264_intrapred_10bit.asm.
Ronald S. Bultje [Mon, 29 Oct 2012 01:39:22 +0000 (18:39 -0700)]
Remove usage of INIT_AVX in h264_intrapred_10bit.asm.

Replace INIT_AVX by INIT_XMM avx. Port the whole file to use cpuflag
based function declarations. Remove (now unused) cputype argument in
function declaration macros. Change function prototypes to have mmx2
instead of mmxext as suffix, since that's required by cpuflags.

6 years agodv: fix indentation
Anton Khirnov [Wed, 24 Oct 2012 07:12:42 +0000 (09:12 +0200)]
dv: fix indentation

6 years agodv: use AVStream.index instead of abusing AVStream.id
Anton Khirnov [Wed, 24 Oct 2012 07:06:32 +0000 (09:06 +0200)]
dv: use AVStream.index instead of abusing AVStream.id

6 years agopictordec: decode 1bpp / 4bpp images when extra header marker is missing
Piotr Bandurski [Mon, 29 Oct 2012 17:43:42 +0000 (18:43 +0100)]
pictordec: decode 1bpp / 4bpp images when extra header marker is missing

based on 56f6628bca66ef3b6a1028fcf0f52dbe01115d89

samples:

http://www.datafilehost.com/download-94b5bc1b.html

Reviewed-and-Tested-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add ashowinfo filter
Anton Khirnov [Tue, 23 Oct 2012 19:37:26 +0000 (21:37 +0200)]
lavfi: add ashowinfo filter

It can be useful for debugging.

Based on a patch by Stefano Sabatini <stefano.sabatini-lala@poste.it>

6 years agoavuidec: correct long_name
Piotr Bandurski [Mon, 29 Oct 2012 17:53:58 +0000 (18:53 +0100)]
avuidec: correct long_name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: remove duplicated .capabilities
Paul B Mahol [Mon, 29 Oct 2012 20:06:52 +0000 (20:06 +0000)]
lavc: remove duplicated .capabilities

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec: Add a RFC 3389 comfort noise codec
Martin Storsjö [Mon, 22 Oct 2012 21:02:41 +0000 (00:02 +0300)]
avcodec: Add a RFC 3389 comfort noise codec

This isn't too useful as a normal codec, but can be used in
voip style applications. The decoder updates the noise
generator parameters when a packet is given to it for decoding,
but if called with an empty packet, it generates more noise
according to the last parameters.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolpc: Add a function for calculating reflection coefficients from samples
Martin Storsjö [Thu, 25 Oct 2012 12:33:15 +0000 (15:33 +0300)]
lpc: Add a function for calculating reflection coefficients from samples

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolpc: Add a function for calculating reflection coefficients from autocorrelation...
Justin Ruggles [Sat, 27 Oct 2012 19:29:56 +0000 (22:29 +0300)]
lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavr: document upper bound on number of output samples.
Anton Khirnov [Sun, 28 Oct 2012 21:52:55 +0000 (22:52 +0100)]
lavr: document upper bound on number of output samples.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavr: add general API usage doxy
Anton Khirnov [Sun, 28 Oct 2012 21:52:54 +0000 (22:52 +0100)]
lavr: add general API usage doxy

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoindeo3: remove duplicate capabilities line.
Anton Khirnov [Mon, 29 Oct 2012 11:16:05 +0000 (12:16 +0100)]
indeo3: remove duplicate capabilities line.

6 years agofate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
Diego Biurrun [Fri, 19 Oct 2012 22:14:26 +0000 (00:14 +0200)]
fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups

6 years agofate: ac3: Add dependencies
Diego Biurrun [Fri, 19 Oct 2012 23:13:39 +0000 (01:13 +0200)]
fate: ac3: Add dependencies

6 years agofate: Add shorthands for acodec PCM and ADPCM tests
Diego Biurrun [Wed, 17 Oct 2012 17:47:03 +0000 (19:47 +0200)]
fate: Add shorthands for acodec PCM and ADPCM tests

6 years agoavconv: Drop unused function argument from do_video_stats()
Diego Biurrun [Wed, 24 Oct 2012 17:18:12 +0000 (19:18 +0200)]
avconv: Drop unused function argument from do_video_stats()

6 years agocmdutils: Conditionally compile libswscale-related bits
Diego Biurrun [Mon, 29 Oct 2012 17:00:14 +0000 (18:00 +0100)]
cmdutils: Conditionally compile libswscale-related bits

This fixes compilation with libswscale disabled.

6 years agolavfi/frei0r: allow for Windows style paths
rogerdpack [Wed, 10 Oct 2012 23:28:55 +0000 (17:28 -0600)]
lavfi/frei0r: allow for Windows style paths

Update path handling against the latest Frei0r specification changes.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavfi/frei0r: update link to spec
Stefano Sabatini [Mon, 29 Oct 2012 17:07:19 +0000 (18:07 +0100)]
lavfi/frei0r: update link to spec

Fri0r project moved from piksel.org to frei0r.dyne.org.

6 years agoaacenc: Drop some unused function arguments
Diego Biurrun [Wed, 24 Oct 2012 17:16:08 +0000 (19:16 +0200)]
aacenc: Drop some unused function arguments

6 years agolavfi/scale: implement clever/insane parsing heuristic, and add a size option
Stefano Sabatini [Mon, 29 Oct 2012 10:48:53 +0000 (11:48 +0100)]
lavfi/scale: implement clever/insane parsing heuristic, and add a size option

If the first argument can be read as a video size, set that output size
in the scale. This allows to specify in a filtergraph scale=qcif or
scale=320x240.

This is not completely safe, for example in case of a typo in the video
size string the first argument will be read as the input width
expression, giving rise to a confusing comment.

6 years agolavu/parseutils: add trailing characters check in av_parse_video_size()
Stefano Sabatini [Mon, 29 Oct 2012 15:39:13 +0000 (16:39 +0100)]
lavu/parseutils: add trailing characters check in av_parse_video_size()

Return an error in case the video size specifications contains spurious
trailing chars, like in "320x240foobar".

6 years agodoc/filters: itemize scale examples, and create a dedicated subsection for them
Stefano Sabatini [Sat, 6 Oct 2012 10:39:11 +0000 (12:39 +0200)]
doc/filters: itemize scale examples, and create a dedicated subsection for them

6 years agolavfi/scale: return error code in case of failed reconfiguration in start_frame()
Stefano Sabatini [Mon, 15 Oct 2012 07:21:15 +0000 (09:21 +0200)]
lavfi/scale: return error code in case of failed reconfiguration in start_frame()

Avoid an assert, since now the function supports error code return.

6 years agolavfi/scale: accept named options, make parsing more robust
Stefano Sabatini [Sat, 6 Oct 2012 10:30:26 +0000 (12:30 +0200)]
lavfi/scale: accept named options, make parsing more robust

Also update documentation accordingly.

6 years agortsp: Avoid a cast when calling strtol
Martin Storsjö [Mon, 22 Oct 2012 20:13:49 +0000 (23:13 +0300)]
rtsp: Avoid a cast when calling strtol

This gets rid of this warning:

libavformat/rtsp.c: In function ‘rtsp_parse_transport’:
libavformat/rtsp.c:794: warning: cast discards qualifiers from pointer target type

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Add required 'prof' atom to 'tapt' atom set.
Tim Nicholson [Mon, 29 Oct 2012 13:56:57 +0000 (13:56 +0000)]
movenc: Add required 'prof' atom to 'tapt' atom set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 29 Oct 2012 12:15:16 +0000 (13:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: add CODEC_CAP_DR1 to all video decoders missing them
  rtpdec: Cosmetic cleanup

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonut: support textual data
Luca Barbato [Thu, 25 Oct 2012 12:05:40 +0000 (14:05 +0200)]
nut: support textual data

Plain text (utf8 encoded) data can be muxed and demuxed in nut.

6 years agodoc/syntax: add a "Quoting and escaping" section
Stefano Sabatini [Mon, 15 Oct 2012 09:13:13 +0000 (11:13 +0200)]
doc/syntax: add a "Quoting and escaping" section

6 years agonutenc: verbosely report unsupported negative pts
Luca Barbato [Sat, 27 Oct 2012 14:56:37 +0000 (16:56 +0200)]
nutenc: verbosely report unsupported negative pts

Additionally use the correct error number.

6 years agolavc: add CODEC_CAP_DR1 to all video decoders missing them
Anton Khirnov [Wed, 17 Oct 2012 19:39:04 +0000 (21:39 +0200)]
lavc: add CODEC_CAP_DR1 to all video decoders missing them

6 years agodcadec: skip QMF on unused channels
Michael Niedermayer [Mon, 29 Oct 2012 04:21:47 +0000 (05:21 +0100)]
dcadec: skip QMF on unused channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmoothstreamingenc: check return value of mkdir()
Michael Niedermayer [Mon, 29 Oct 2012 02:34:17 +0000 (03:34 +0100)]
smoothstreamingenc: check return value of mkdir()

Fixes CID732188
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosmoothstreamingenc: fix integer overflow
Michael Niedermayer [Mon, 29 Oct 2012 02:17:08 +0000 (03:17 +0100)]
smoothstreamingenc: fix integer overflow

Fixes CID732248
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoismindex: check return value of avio_open_dyn_buf()
Michael Niedermayer [Mon, 29 Oct 2012 01:53:43 +0000 (02:53 +0100)]
ismindex: check return value of avio_open_dyn_buf()

Fixes CID733723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: avoid using cpp directives within printf macro arguments
Leon van Stuivenberg [Sun, 28 Oct 2012 22:37:17 +0000 (23:37 +0100)]
cmdutils: avoid using cpp directives within printf macro arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
It appears such construct has undefined behavior

6 years agocafdec: fix parsing of chunks which may have unused data
Paul B Mahol [Fri, 26 Oct 2012 14:01:51 +0000 (14:01 +0000)]
cafdec: fix parsing of chunks which may have unused data

Specification mentions 'strg', 'mark', 'regn', 'info', .. chunks
to have data section size larger than chunk's current meaningful
content in order to reserve room for additional data.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/srtenc: add AVFMT_TS_NONSTRICT flag.
Clément Bœsch [Fri, 26 Oct 2012 22:01:49 +0000 (00:01 +0200)]
lavf/srtenc: add AVFMT_TS_NONSTRICT flag.

There is not really a problem in having two events at the same time.
Even if it's not perfectly correct, it helps remuxing more files
(typically our FATE sample).

6 years agortpdec: Cosmetic cleanup
Martin Storsjö [Mon, 22 Oct 2012 12:54:25 +0000 (15:54 +0300)]
rtpdec: Cosmetic cleanup

Mainly clean up the RTP statistics code, plus a few other obviously
misindentend lines.

Remove some useless comments, de-doxygenize some comments,
add spacing around operators and fix a typo.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofate/scalenorm: unbreak fate
Michael Niedermayer [Sun, 28 Oct 2012 17:26:11 +0000 (18:26 +0100)]
fate/scalenorm: unbreak fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests: do not set bogus scale sws_flags option in the scalenorm test
Stefano Sabatini [Sun, 28 Oct 2012 16:15:15 +0000 (17:15 +0100)]
tests: do not set bogus scale sws_flags option in the scalenorm test

sws_flags is not a valid scale option, and thus is ignored.

6 years agoframe_thread_encode: fix context memleak
Michael Niedermayer [Sun, 28 Oct 2012 16:04:11 +0000 (17:04 +0100)]
frame_thread_encode: fix context memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoframe_thread_encoder: fix packet memleak
Michael Niedermayer [Sun, 28 Oct 2012 15:47:23 +0000 (16:47 +0100)]
frame_thread_encoder: fix packet memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: mark by assert that the default path cannot occur
Michael Niedermayer [Sun, 28 Oct 2012 15:07:01 +0000 (16:07 +0100)]
vc1dec: mark by assert that the default path cannot occur

Fixes CID703827, CID703828
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoparse ID3v2 chapters
Paul B Mahol [Sat, 27 Oct 2012 22:00:09 +0000 (22:00 +0000)]
parse ID3v2 chapters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoSynchronize libmpcodecs: Support 16bit yuv in telecine filter.
Carl Eugen Hoyos [Sun, 28 Oct 2012 14:46:35 +0000 (15:46 +0100)]
Synchronize libmpcodecs: Support 16bit yuv in telecine filter.

Fixes ticket 1782.

6 years agoAdd an additional AAC TwoCC.
Carl Eugen Hoyos [Sun, 28 Oct 2012 13:50:11 +0000 (14:50 +0100)]
Add an additional AAC TwoCC.

Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx
Originally committed to vlc by Jean-Baptiste.

6 years agomovenc: add more metadata types
bbraun [Tue, 21 Aug 2012 01:21:39 +0000 (03:21 +0200)]
movenc: add more metadata types

Fixes Ticket1052

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: keep context size variables
Michael Niedermayer [Fri, 12 Oct 2012 16:58:55 +0000 (18:58 +0200)]
lavu: keep context size variables

They are essential to be able to use the utils without av_malloc()
That is for example use with malloc(), memalign(), some other
private allocation function, on the stack or others.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 28 Oct 2012 13:04:43 +0000 (14:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  yuv4mpeg: reject unsupported codecs
  nutenc: K&R formatting cosmetics
  assdec: fix qsort() callback signature
  configure: detect sparc64 automatically
  vp8: fix memset() crossing array boundary
  h264: fix invalid pointer arithmetic
  amrwbdec: fix invalid pointer arithmetic

Conflicts:
libavformat/nutenc.c
libavformat/yuv4mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
Michael Niedermayer [Sun, 28 Oct 2012 12:19:11 +0000 (13:19 +0100)]
Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26':
  avio: fix pointer type mismatches in avio_enum_protocols()
  avserver: use socklen_t where appropriate
  udp: use socklen_t where appropriate
  network: use HAVE_THREADS instead of local hack
  af_channelmap: remove stray enum declaration
  buffersink: remove stray semicolon after function definition

Conflicts:
libavformat/avio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: make sure the global sws flags are set to be bitexact for scalenorm
Michael Niedermayer [Sun, 28 Oct 2012 12:05:35 +0000 (13:05 +0100)]
fate: make sure the global sws flags are set to be bitexact for scalenorm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add a test for scale with variable input format.
Nicolas George [Thu, 25 Oct 2012 19:28:11 +0000 (21:28 +0200)]
fate: add a test for scale with variable input format.

6 years agolavfi/concat: implement unsafe mode.
Nicolas George [Thu, 25 Oct 2012 19:27:41 +0000 (21:27 +0200)]
lavfi/concat: implement unsafe mode.

6 years agoyuv4mpeg: reject unsupported codecs
Luca Barbato [Fri, 26 Oct 2012 20:55:04 +0000 (22:55 +0200)]
yuv4mpeg: reject unsupported codecs

The muxer already rejects unsupported pixel formats, reject also
unsupported codecs to prevent dangerous misuses.

6 years agonutenc: K&R formatting cosmetics
Luca Barbato [Fri, 26 Oct 2012 22:41:02 +0000 (00:41 +0200)]
nutenc: K&R formatting cosmetics

6 years agolpc: check that lpc_type is valid in ff_lpc_calc_coefs
Michael Niedermayer [Sun, 28 Oct 2012 02:27:16 +0000 (03:27 +0100)]
lpc: check that lpc_type is valid in ff_lpc_calc_coefs

Fixes CID700759
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosws: rgb has no range, avoid random results if the user tries to mess with it anyway.
Michael Niedermayer [Sun, 28 Oct 2012 00:46:56 +0000 (02:46 +0200)]
sws: rgb has no range, avoid random results if the user tries to mess with it anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: use 64bit index/len for x86_64 mix
Michael Niedermayer [Sun, 28 Oct 2012 00:09:08 +0000 (02:09 +0200)]
swr: use 64bit index/len for x86_64 mix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_showinfo: check return code of av_image_get_linesize()
Michael Niedermayer [Sat, 27 Oct 2012 22:40:28 +0000 (00:40 +0200)]
vf_showinfo: check return code of av_image_get_linesize()

Fixes CID703716
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswfenc: zero fifo after freeing
Michael Niedermayer [Sat, 27 Oct 2012 21:02:17 +0000 (23:02 +0200)]
swfenc: zero fifo after freeing

Fixes CID602000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotak_parser: check ff_combine_frame() return code
Michael Niedermayer [Sat, 27 Oct 2012 20:45:51 +0000 (22:45 +0200)]
tak_parser: check ff_combine_frame() return code

Fixes CID733706
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/showspectrum: fix unaligned rdft data.
Clément Bœsch [Fri, 26 Oct 2012 16:42:54 +0000 (18:42 +0200)]
lavf/showspectrum: fix unaligned rdft data.

6 years agoriff: support 0xa100 TwoCC
Piotr Bandurski [Sat, 27 Oct 2012 19:32:40 +0000 (21:32 +0200)]
riff: support 0xa100 TwoCC

fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856
(0xa100 = Comverse Infosys Ltd. G723 1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsmpeg4dec: fix init code to not fail when called from 2 threads at the same time.
Michael Niedermayer [Sat, 27 Oct 2012 19:30:01 +0000 (21:30 +0200)]
msmpeg4dec: fix init code to not fail when called from 2 threads at the same time.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_h263_decode_init_vlc: fix order of operations to avoid failure with 2 threads
Michael Niedermayer [Sat, 27 Oct 2012 19:28:59 +0000 (21:28 +0200)]
ff_h263_decode_init_vlc: fix order of operations to avoid failure with 2 threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoassdec: fix qsort() callback signature
Mans Rullgard [Fri, 26 Oct 2012 16:59:50 +0000 (17:59 +0100)]
assdec: fix qsort() callback signature

This changes the event_cmp() function to the correct signature,
avoiding an ugly cast.

Signed-off-by: Mans Rullgard <mans@mansr.com>