ffmpeg.git
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC horizontal and vertical...
Shivraj Patil [Fri, 17 Apr 2015 13:12:28 +0000 (18:42 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC horizontal and vertical mc functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMakefile: Add support for MSA (MIPS-SIMD-Arch)
Shivraj Patil [Fri, 17 Apr 2015 13:12:27 +0000 (18:42 +0530)]
Makefile: Add support for MSA (MIPS-SIMD-Arch)

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegaudiodec_template: use double to build csa tables
Michael Niedermayer [Fri, 17 Apr 2015 11:36:14 +0000 (13:36 +0200)]
avcodec/mpegaudiodec_template: use double to build csa tables

Fixes rounding difference between 32bit x86 and 64bit
Fixes fate failure with gapless mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/atrac3plusdsp: fix on stack alignment
Michael Niedermayer [Fri, 17 Apr 2015 09:58:41 +0000 (11:58 +0200)]
avcodec/atrac3plusdsp: fix on stack alignment

Fixes fate failure on ARM

4 years agowebmdashenc: Add better error handling
Vignesh Venkatasubramanian [Fri, 17 Apr 2015 00:32:21 +0000 (17:32 -0700)]
webmdashenc: Add better error handling

Return appropriate error codes and propagate the error codes from
helper functions to the outer calls. Also fix a potential leak in
call to av_realloc.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: remove old libdcadec check
James Almer [Thu, 16 Apr 2015 23:04:57 +0000 (20:04 -0300)]
configure: remove old libdcadec check

It's obsolete after the addition of the pkg-config check.
See http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/191983 for the
relevant discussion

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agofate: add mp3 gapless test
wm4 [Wed, 15 Apr 2015 19:10:49 +0000 (21:10 +0200)]
fate: add mp3 gapless test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoac3: validate end in ff_ac3_bit_alloc_calc_mask
Andreas Cadhalpun [Thu, 16 Apr 2015 19:25:26 +0000 (21:25 +0200)]
ac3: validate end in ff_ac3_bit_alloc_calc_mask

This fixes an invalid read if end is 0:
     band_end   = ff_ac3_bin_to_band_tab[end-1] + 1;

Depending on what is before the array, this can cause stack smashing,
when band_end becomes too large.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/assenc: handle extra sections after Events
Rodger Combs [Sat, 4 Apr 2015 10:31:22 +0000 (05:31 -0500)]
lavf/assenc: handle extra sections after Events

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacpsy: avoid psy_band->threshold becoming NaN
Andreas Cadhalpun [Thu, 16 Apr 2015 18:04:54 +0000 (20:04 +0200)]
aacpsy: avoid psy_band->threshold becoming NaN

If band->thr is 0.0f, the division is undefined, making norm_fac not a
number or infinity, which causes psy_band->threshold to become NaN.

This is passed on to other variables until it finally reaches
sce->sf_idx and is converted to an integer (-2147483648).

This causes a segmentation fault when it is used as array index.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaasc: return correct buffer size from aasc_decode_frame
Andreas Cadhalpun [Thu, 16 Apr 2015 17:12:02 +0000 (19:12 +0200)]
aasc: return correct buffer size from aasc_decode_frame

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacdec: consistently use avctx for logging in decode_eld_specific_config
Andreas Cadhalpun [Thu, 16 Apr 2015 14:58:32 +0000 (16:58 +0200)]
aacdec: consistently use avctx for logging in decode_eld_specific_config

ac may be NULL and then accessing ac->avctx results in a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add missing dependencies for MIPS and PPC features
James Almer [Thu, 16 Apr 2015 05:59:17 +0000 (02:59 -0300)]
configure: add missing dependencies for MIPS and PPC features

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agomsrledec: use signed pixel_ptr in msrle_decode_pal4
Andreas Cadhalpun [Thu, 16 Apr 2015 12:49:08 +0000 (14:49 +0200)]
msrledec: use signed pixel_ptr in msrle_decode_pal4

This fixes segmentation faults, when pic->linesize[0] is negative.
In that case 'line * pic->linesize[0] + pixel_ptr' is treated as
unsigned and wraps around.

This reverts commit 7d78a964.
The problem was introduced in commit f7e1367f, which should obsolete
that commit.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add pkg-config support for libdcadec
Simon Thelen [Wed, 15 Apr 2015 15:18:58 +0000 (17:18 +0200)]
configure: add pkg-config support for libdcadec

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoivfenc: incorrect fourcc for VP9 video
Victor Anjin [Wed, 15 Apr 2015 16:51:59 +0000 (23:51 +0700)]
ivfenc: incorrect fourcc for VP9 video

VP80 fourcc are writed for all contexts (without ctx->codec_tag)
how to reproduce the issue:
1) Get any vp9 video (for example  http://base-n.de/webm/out9.webm)
2) ffmpeg  -i out9.webm -vcodec copy out9.ivf
3) out9.ivf have VP80 fourcc at ivf header
The proposed fix solves this issue

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/avf_showcqt: fix error code.
Nicolas George [Thu, 16 Apr 2015 09:31:23 +0000 (11:31 +0200)]
lavfi/avf_showcqt: fix error code.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Preserve packet duration when parsing is done only for headers
Michael Niedermayer [Tue, 14 Apr 2015 22:06:17 +0000 (00:06 +0200)]
avformat/utils: Preserve packet duration when parsing is done only for headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_ps: Validate num_units_in_tick/time_scale before setting them in the...
Michael Niedermayer [Wed, 15 Apr 2015 23:59:19 +0000 (01:59 +0200)]
avcodec/h264_ps: Validate num_units_in_tick/time_scale before setting them in the context

This probably makes no big difference but it is more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: Do not fail on unsupported timing info
Vittorio Giovara [Wed, 15 Apr 2015 12:27:01 +0000 (13:27 +0100)]
h264: Do not fail on unsupported timing info

The spec madandate both time_scale and num_units_in_tick greater than 0,
however since they are not essential for decoding, just ignore the whole
block and try to finish parsing the VUI.

Related to Ticket4445.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoaaccoder: Implement Perceptual Noise Substitution for AAC
Rostislav Pehlivanov [Wed, 15 Apr 2015 11:18:42 +0000 (12:18 +0100)]
aaccoder: Implement Perceptual Noise Substitution for AAC

This commit implements the perceptual noise substitution AAC extension. This is a proof of concept
implementation, and as such, is not enabled by default. This is the fourth revision of this patch,
made after some problems were noted out. Any changes made since the previous revisions have been indicated.

In order to extend the encoder to use an additional codebook, the array holding each codebook has been
modified with two additional entries - 13 for the NOISE_BT codebook and 12 which has a placeholder function.
The cost system was modified to skip the 12th entry using an array to map the input and outputs it has. It
also does not accept using the 13th codebook for any band which is not marked as containing noise, thereby
restricting its ability to arbitrarily choose it for bands. The use of arrays allows the system to be easily
extended to allow for intensity stereo encoding, which uses additional codebooks.

The 12th entry in the codebook function array points to a function which stops the execution of the program
by calling an assert with an always 'false' argument. It was pointed out in an email discussion with
Claudio Freire that having a 'NULL' entry can result in unexpected behaviour and could be used as
a security hole. There is no danger of this function being called during encoding due to the codebook maps introduced.

Another change from version 1 of the patch is the addition of an argument to the encoder, '-aac_pns' to
enable and disable the PNS. This currently defaults to disable the PNS, as it is experimental.
The switch will be removed in the future, when the algorithm to select noise bands has been improved.
The current algorithm simply compares the energy to the threshold (multiplied by a constant) to determine
noise, however the FFPsyBand structure contains other useful figures to determine which bands carry noise more accurately.

Some of the sample files provided triggered an assertion when the parameter to tune the threshold was set to
a value of '2.2'. Claudio Freire reported the problem's source could be in the range of the scalefactor
indices for noise and advised to measure the minimal index and clip anything above the maximum allowed
value. This has been implemented and all the files which used to trigger the asserion now encode without error.

The third revision of the problem also removes unneded variabes and comparisons. All of them were
redundant and were of little use for when the PNS implementation would be extended.

The fourth revision moved the clipping of the noise scalefactors outside the second loop of the two-loop
algorithm in order to prevent their redundant calculations. Also, freq_mult has been changed to a float
variable due to the fact that rounding errors can prove to be a problem at low frequencies.
Considerations were taken whether the entire expression could be evaluated inside the expression
, but in the end it was decided that it would be for the best if just the type of the variable were
to change. Claudio Freire reported the two problems. There is no change of functionality
(except for low sampling frequencies) so the spectral demonstrations at the end of this commit's message were not updated.

Finally, the way energy values are converted to scalefactor indices has changed since the first commit,
as per the suggestion of Claudio Freire. This may still have some drawbacks, but unlike the first commit
it works without having redundant offsets and outputs what the decoder expects to have, in terms of the
ranges of the scalefactor indices.

Some spectral comparisons: https://trac.ffmpeg.org/attachment/wiki/Encode/AAC/Original.png (original),
https://trac.ffmpeg.org/attachment/wiki/Encode/AAC/PNS_NO.png (encoded without PNS),
https://trac.ffmpeg.org/attachment/wiki/Encode/AAC/PNS1.2.png (encoded with PNS, const = 1.2),
https://trac.ffmpeg.org/attachment/wiki/Encode/AAC/Difference1.png (spectral difference).
The constant is the value which multiplies the threshold when it gets compared to the energy, larger
values means more noise will be substituded by PNS values. Example when const = 2.2:
https://trac.ffmpeg.org/attachment/wiki/Encode/AAC/PNS_2.2.png

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil/softfloat: Change order of fields in SoftFloat structure.
Nedeljko Babic [Wed, 15 Apr 2015 13:14:06 +0000 (15:14 +0200)]
libavutil/softfloat: Change order of fields in SoftFloat structure.

Softfloat will be used in implementation of AAC fixed point decoder.
This change is needed in order to more easily integrate ffmpegs softfloat in
already developed algorithm for AAC.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/intelh263dec: Use check_marker()
Michael Niedermayer [Wed, 15 Apr 2015 12:36:03 +0000 (14:36 +0200)]
avcodec/intelh263dec: Use check_marker()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mp3dec: offset seek index to end of vbr headers
wm4 [Tue, 14 Apr 2015 19:24:36 +0000 (21:24 +0200)]
avformat/mp3dec: offset seek index to end of vbr headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "avformat/mp3dec: offset seek index to end of id3v2 tag"
wm4 [Tue, 14 Apr 2015 19:24:35 +0000 (21:24 +0200)]
Revert "avformat/mp3dec: offset seek index to end of id3v2 tag"

This reverts commit 8b76c0eb561b0313e2a27950fe9d2bc5e4780dd8.

It was slightly incorrect; the next commit fixes it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mp3dec: Allow forcing the use of the xing TOC for CBR files
Michael Niedermayer [Wed, 15 Apr 2015 11:24:19 +0000 (13:24 +0200)]
avformat/mp3dec: Allow forcing the use of the xing TOC for CBR files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df'
Michael Niedermayer [Wed, 15 Apr 2015 09:57:00 +0000 (11:57 +0200)]
Merge commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df'

* commit 'ec89f35e3e5eb9ec5221266e801efeee7ecab4df':
  x265: Map color parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b'
Michael Niedermayer [Wed, 15 Apr 2015 09:34:45 +0000 (11:34 +0200)]
Merge commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b'

* commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b':
  x264: Map color parameters

Conflicts:
libavcodec/libx264.c

See: 48d39c8786d2a1a36258d8e442602729eef0474c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox265: Map color parameters
Luca Barbato [Mon, 13 Apr 2015 08:45:51 +0000 (10:45 +0200)]
x265: Map color parameters

4 years agox264: Map color parameters
Luca Barbato [Mon, 13 Apr 2015 08:45:51 +0000 (10:45 +0200)]
x264: Map color parameters

4 years agoavcodec/ituh263dec: Use check_marker()
Michael Niedermayer [Wed, 15 Apr 2015 01:22:27 +0000 (03:22 +0200)]
avcodec/ituh263dec: Use check_marker()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc: use correct type for printf() argument
wm4 [Tue, 14 Apr 2015 19:24:34 +0000 (21:24 +0200)]
lavc: use correct type for printf() argument

This was passing uint32_t for %d.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat, avcodec: log discard padding
wm4 [Tue, 14 Apr 2015 19:24:33 +0000 (21:24 +0200)]
avformat, avcodec: log discard padding

Useful for debugging.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowebdashenc: replace unchecked av_malloc with stack allocation
Vignesh Venkatasubramanian [Tue, 14 Apr 2015 17:54:23 +0000 (10:54 -0700)]
webdashenc: replace unchecked av_malloc with stack allocation

Replace an unchecked av_malloc call with stack allocation as the size
is always a constant.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7a5f44476696b495e0de658ed859bcb8520b93d4'
Michael Niedermayer [Tue, 14 Apr 2015 18:09:44 +0000 (20:09 +0200)]
Merge commit '7a5f44476696b495e0de658ed859bcb8520b93d4'

* commit '7a5f44476696b495e0de658ed859bcb8520b93d4':
  avisynth: Bump minimum required version to interface version 6

Conflicts:
doc/general.texi
libavformat/avisynth.c

See: 3723a183103718352b37ec2617f71e96ee2c3846
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a6a45e5a9a9dfb725456f62e053532e505aadcfc'
Michael Niedermayer [Tue, 14 Apr 2015 18:07:07 +0000 (20:07 +0200)]
Merge commit 'a6a45e5a9a9dfb725456f62e053532e505aadcfc'

* commit 'a6a45e5a9a9dfb725456f62e053532e505aadcfc':
  avisynth: Fix detection of AviSynth 2.5

See: d858c3a18f193a54fb083223f1a7fa0470ddfac6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacdec: Use macros for constants
Rostislav Pehlivanov [Mon, 13 Apr 2015 23:33:52 +0000 (00:33 +0100)]
aacdec: Use macros for constants

This commit replaces the previous hardcoded constants with both new and previously
defined macros from aac.h. This change makes it easy for anyone reading the code
to know how encoding and decoding scalefactors works. It's also possibly
a step in unifying some of the code across both the encoder and decoder.

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Use check_marker()
Michael Niedermayer [Tue, 14 Apr 2015 13:08:11 +0000 (15:08 +0200)]
avcodec/mpeg12dec: Use check_marker()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/get_bits: print details of the location of the missing bit in check_marker()
Michael Niedermayer [Tue, 14 Apr 2015 12:53:17 +0000 (14:53 +0200)]
avcodec/get_bits: print details of the location of the missing bit in check_marker()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/alsdec: use av_malloc(z)_array()
Paul B Mahol [Mon, 13 Apr 2015 18:44:49 +0000 (18:44 +0000)]
avcodec/alsdec: use av_malloc(z)_array()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/mpeg4videodec: Improve wording of the missing header warning messages
Michael Niedermayer [Tue, 14 Apr 2015 12:17:07 +0000 (14:17 +0200)]
avcodec/mpeg4videodec: Improve wording of the missing header warning  messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg4videodec: change log level to waning for incomplete header messages
Michael Niedermayer [Tue, 14 Apr 2015 12:12:38 +0000 (14:12 +0200)]
avcodec/mpeg4videodec: change log level to waning for incomplete header messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea'
Michael Niedermayer [Tue, 14 Apr 2015 11:57:53 +0000 (13:57 +0200)]
Merge commit '13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea'

* commit '13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea':
  mpeg4videodec: Remove useless messages

Conflicts:
libavcodec/mpeg4videodec.c

not merged, the messages have been an important aid for debugging in old mpeg4
and help understanding bug reports

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavisynth: Bump minimum required version to interface version 6
Stephen Hutchinson [Thu, 2 Apr 2015 19:39:26 +0000 (15:39 -0400)]
avisynth: Bump minimum required version to interface version 6

The AVSC_API changes in the new headers mean that the 2.6 alphas
are just as incompatible as 2.5 is.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoavisynth: Fix detection of AviSynth 2.5
Stephen Hutchinson [Thu, 2 Apr 2015 19:39:25 +0000 (15:39 -0400)]
avisynth: Fix detection of AviSynth 2.5

In order to safely exit when the user tries to use AviSynth 2.5, the
continue_on_fail value for 2.6's functions need to be set to 1.
Otherwise, the library loader fails before the 'upgrade to 2.6'
log message appears.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoMerge commit '49e531ff4706279c7eed774f2c8b896942924ce2'
Michael Niedermayer [Tue, 14 Apr 2015 11:40:36 +0000 (13:40 +0200)]
Merge commit '49e531ff4706279c7eed774f2c8b896942924ce2'

* commit '49e531ff4706279c7eed774f2c8b896942924ce2':
  mmal: Reference MMAL VC lib explicitly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2de7650451d90520135d8cf6f96caa0658824208'
Michael Niedermayer [Tue, 14 Apr 2015 11:28:19 +0000 (13:28 +0200)]
Merge commit '2de7650451d90520135d8cf6f96caa0658824208'

* commit '2de7650451d90520135d8cf6f96caa0658824208':
  mmal: Move system headers before local headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agompeg4videodec: Remove useless messages
wm4 [Mon, 13 Apr 2015 17:35:54 +0000 (19:35 +0200)]
mpeg4videodec: Remove useless messages

They seem to sometimes trigger with old AVI files. They are just
confusing, do not help anyone, and use sloppy language.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agommal: Reference MMAL VC lib explicitly
wm4 [Mon, 13 Apr 2015 17:18:00 +0000 (19:18 +0200)]
mmal: Reference MMAL VC lib explicitly

This is optional, but ensures that linking with -Wl,--as-needed does not
drop the library containing the MMAL VC driver. The driver normally
"registers" itself in the library constructor, but since no symbols are
explicitly referenced, the linker could remove it with --as-needed
enabled.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agommal: Move system headers before local headers
wm4 [Mon, 13 Apr 2015 17:17:59 +0000 (19:17 +0200)]
mmal: Move system headers before local headers

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoavfilter/drawtext: fix frame mem leak
Ivan Efimov [Fri, 10 Apr 2015 14:28:45 +0000 (17:28 +0300)]
avfilter/drawtext: fix frame mem leak

Signed-off-by: Ivan Efimov <ioefimov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacenc: Adjust the initial offset for PNS values
Rostislav Pehlivanov [Mon, 13 Apr 2015 23:33:51 +0000 (00:33 +0100)]
aacenc: Adjust the initial offset for PNS values

This commit adjusts the intial offset for PNS values, introduced
with commit f7f71b5795d708763eb0c55fe5e2cb051b2b69f4 earlier. This
commit shifts the value in such a way that no further offsets are
required in the aaccoder.c file. Earlier version of the PNS patch had 2 offsets in both the aaccoder and aacenc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 14 Apr 2015 01:07:57 +0000 (03:07 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/atrac3plusdec: Free mdct contexts at the end
Michael Niedermayer [Tue, 14 Apr 2015 00:13:57 +0000 (02:13 +0200)]
avcodec/atrac3plusdec: Free mdct contexts at the end

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mpegtsenc: Accept 0x000001 as startcode for hevc.
Carl Eugen Hoyos [Mon, 13 Apr 2015 23:57:38 +0000 (01:57 +0200)]
lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.

Fixes ticket #4194.

4 years agoavcodec/ffv1: dont leave stale pointers in memory
Michael Niedermayer [Mon, 13 Apr 2015 18:08:42 +0000 (20:08 +0200)]
avcodec/ffv1: dont leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffv1: remove unneeded variable
Michael Niedermayer [Mon, 13 Apr 2015 18:07:45 +0000 (20:07 +0200)]
avcodec/ffv1: remove unneeded variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffv1: use av_freep()
Michael Niedermayer [Mon, 13 Apr 2015 18:05:56 +0000 (20:05 +0200)]
avcodec/ffv1: use av_freep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'
Michael Niedermayer [Mon, 13 Apr 2015 17:59:41 +0000 (19:59 +0200)]
Merge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'

* commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc':
  ffv1: Check memory allocations

Conflicts:
libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffv1: Check memory allocations
Vittorio Giovara [Thu, 9 Apr 2015 21:37:59 +0000 (23:37 +0200)]
ffv1: Check memory allocations

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoh264: remove bogus YCgCo warning message
wm4 [Mon, 13 Apr 2015 11:03:35 +0000 (13:03 +0200)]
h264: remove bogus YCgCo warning message

YCgCo decoding works just fine. It depends on the API user what is done
with the output. Some API users might support it, some not. Some users
might support it under certain circumstances only.

It is not the job of the decoder to print this message. If the API user
supports it, this message is extremely unhelpful.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_scale: Add warning for AVCOL_SPC_YCGCO
Michael Niedermayer [Mon, 13 Apr 2015 11:45:41 +0000 (13:45 +0200)]
avfilter/vf_scale: Add warning for AVCOL_SPC_YCGCO

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mpeg: vobsub add an option to specify the .sub's URI
Rodger Combs [Mon, 13 Apr 2015 06:17:28 +0000 (01:17 -0500)]
lavf/mpeg: vobsub add an option to specify the .sub's URI

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add tta encoder test
James Almer [Mon, 13 Apr 2015 07:12:28 +0000 (04:12 -0300)]
fate: add tta encoder test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/http: handle case where the server returns a redirect during a seek
Rodger Combs [Mon, 13 Apr 2015 05:39:44 +0000 (00:39 -0500)]
lavf/http: handle case where the server returns a redirect during a seek

txoffer (e.g. http://tori.aoi-chan.com/ ) redirects to the same URI on your
first request, and serves the actual file on the second. It's stupid, but AFAIK
technically compliant. We'd previously see the server not handing back a Range
header and return an error; now, instead, we see that there's a redirect and
keep track of the offset we want while trying again at the new URL.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacenc: Add support for Perceptual Noise Substitution energy values
Rostislav Pehlivanov [Sun, 12 Apr 2015 04:50:34 +0000 (05:50 +0100)]
aacenc: Add support for Perceptual Noise Substitution energy values

This commit implements support for writing the noise energy values used in PNS.
The difference between regular scalefactors and noise energy values is that the latter
require a small preamble (NOISE_PRE + energy_value_diff) to be written as the first
noise-containing band. Any following noise energy values use the previous one to
base their "diff" on. Ordinary scalefactors remain unchanged other than that they ignore the noise values.

This commit should not change anything by itself, the following commits will bring it in use.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/fate: added mxf opatom audio regression tests
Mark Reid [Sun, 12 Apr 2015 23:39:01 +0000 (16:39 -0700)]
tests/fate: added mxf opatom audio regression tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e'
Michael Niedermayer [Sun, 12 Apr 2015 23:43:55 +0000 (01:43 +0200)]
Merge commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e'

* commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e':
  rtsp: Fix unchecked return value

See: aae9f52c4efa4c185f8919dcc6d8c6f25c1df9e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0b72a47f5592ecc035edd5bac57558ad9604612d'
Michael Niedermayer [Sun, 12 Apr 2015 23:34:21 +0000 (01:34 +0200)]
Merge commit '0b72a47f5592ecc035edd5bac57558ad9604612d'

* commit '0b72a47f5592ecc035edd5bac57558ad9604612d':
  rtsp: Check a malloc return value

See: 4b030025278ac4adc3616510f36de4c7a113c5fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtsp: Fix dereference after null check
Himangi Saraogi [Sun, 12 Apr 2015 19:35:52 +0000 (01:05 +0530)]
avformat/rtsp: Fix dereference after null check

This fixes CID 732219

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/swresample-test: Randomly wipe out channel counts
Michael Niedermayer [Sun, 12 Apr 2015 20:08:52 +0000 (22:08 +0200)]
swresample/swresample-test: Randomly wipe out channel counts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: Check channel layouts and channels against each other and print human...
Michael Niedermayer [Sun, 12 Apr 2015 19:08:09 +0000 (21:08 +0200)]
swresample: Check channel layouts and channels against each other and print human readable error messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: Allow reinitialization without ever setting channel layouts
Michael Niedermayer [Sun, 12 Apr 2015 18:50:53 +0000 (20:50 +0200)]
swresample: Allow reinitialization without ever setting channel layouts

4 years agoswresample: Allow reinitialization without ever setting channel counts
Michael Niedermayer [Sun, 12 Apr 2015 17:43:08 +0000 (19:43 +0200)]
swresample: Allow reinitialization without ever setting channel counts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortsp: Fix unchecked return value
Himangi Saraogi [Thu, 9 Apr 2015 18:34:01 +0000 (00:04 +0530)]
rtsp: Fix unchecked return value

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortsp: Check a malloc return value
Himangi Saraogi [Sat, 4 Apr 2015 10:51:40 +0000 (16:21 +0530)]
rtsp: Check a malloc return value

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: add missing h263p decoder dependencies
James Almer [Sun, 12 Apr 2015 18:42:38 +0000 (15:42 -0300)]
configure: add missing h263p decoder dependencies

Should fix ticket #4480

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agofate: Include branch information in the payload header
Timothy Gu [Sun, 12 Apr 2015 15:28:42 +0000 (08:28 -0700)]
fate: Include branch information in the payload header

The server is properly equiped not to choke on that now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpdec_asf: Fix potential pointer overflow
Michael Niedermayer [Sun, 12 Apr 2015 15:41:23 +0000 (17:41 +0200)]
avformat/rtpdec_asf: Fix potential pointer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segafilm: Use av_malloc_array()
Michael Niedermayer [Sun, 12 Apr 2015 14:52:00 +0000 (16:52 +0200)]
avformat/segafilm: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/sierravmd: use av_malloc_array()
Michael Niedermayer [Sun, 12 Apr 2015 14:50:19 +0000 (16:50 +0200)]
avformat/sierravmd: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: add chorus filter
Paul B Mahol [Tue, 24 Jun 2014 08:35:37 +0000 (08:35 +0000)]
avfilter: add chorus filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolibavformat/mxfenc: added support mxf opatom audio muxing
Mark Reid [Sun, 12 Apr 2015 00:18:13 +0000 (17:18 -0700)]
libavformat/mxfenc: added support mxf opatom audio muxing

Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Add atrac3+ tests
Timothy Gu [Fri, 10 Apr 2015 20:24:57 +0000 (13:24 -0700)]
fate: Add atrac3+ tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/http.c: Make http-listen work as an input stream.
Stephan Holljes [Sat, 11 Apr 2015 20:26:57 +0000 (22:26 +0200)]
libavformat/http.c: Make http-listen work as an input stream.

With this patch http can be used to listen for POST data to be used as an input stream.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpproto: Move dscp into context & AVOptions
Michael Niedermayer [Sat, 11 Apr 2015 16:53:54 +0000 (18:53 +0200)]
avformat/rtpproto: Move dscp into context & AVOptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'
Michael Niedermayer [Sat, 11 Apr 2015 15:59:39 +0000 (17:59 +0200)]
Merge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'

* commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac':
  libx265: print supported presets and tunes on error

See: 61090db29a3e8364431d46c16770425815f7608a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'
Michael Niedermayer [Sat, 11 Apr 2015 15:47:19 +0000 (17:47 +0200)]
Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'

* commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2':
  libdc1394: Unbreak build after c201069fa

See: fe25194c5870f21ba10f615f036b64d0c84fca48
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibx265: print supported presets and tunes on error
James Almer [Fri, 10 Apr 2015 19:47:03 +0000 (16:47 -0300)]
libx265: print supported presets and tunes on error

Based on code from libavcodec/libx264.c

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavformat/xwma: Use av_malloc_array()
Michael Niedermayer [Sat, 11 Apr 2015 11:51:03 +0000 (13:51 +0200)]
avformat/xwma: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/wtvenc: Use av_realloc_array()
Michael Niedermayer [Sat, 11 Apr 2015 11:50:07 +0000 (13:50 +0200)]
avformat/wtvenc: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nsvdec: Use av_malloc_array()
Michael Niedermayer [Sat, 11 Apr 2015 11:18:41 +0000 (13:18 +0200)]
avformat/nsvdec: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibdc1394: Unbreak build after c201069fa
Michael Kostylev [Sat, 11 Apr 2015 08:37:49 +0000 (10:37 +0200)]
libdc1394: Unbreak build after c201069fa

4 years agortpenc_jpeg: handle case of picture dimensions not dividing by 8
Andrey Utkin [Fri, 10 Apr 2015 21:54:10 +0000 (00:54 +0300)]
rtpenc_jpeg: handle case of picture dimensions not dividing by 8

This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4f373a5111f900af54301907132942f95276285c'
Michael Niedermayer [Fri, 10 Apr 2015 23:35:16 +0000 (01:35 +0200)]
Merge commit '4f373a5111f900af54301907132942f95276285c'

* commit '4f373a5111f900af54301907132942f95276285c':
  vfwcap: Unbreak building after c201069fa

Conflicts:
libavdevice/vfwcap.c

See: 4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: add aarch64 cpuflags to fftools documentation
James Almer [Fri, 10 Apr 2015 23:52:29 +0000 (20:52 -0300)]
doc: add aarch64 cpuflags to fftools documentation

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agodoc: add missing arm cpuflags to fftools documentation
James Almer [Fri, 10 Apr 2015 23:51:35 +0000 (20:51 -0300)]
doc: add missing arm cpuflags to fftools documentation

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agodoc: add missing x86 cpuflags to fftools documentation
James Almer [Fri, 10 Apr 2015 23:51:11 +0000 (20:51 -0300)]
doc: add missing x86 cpuflags to fftools documentation

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoUse @verbatim instead of @example for ASCII arts
Timothy Gu [Mon, 23 Mar 2015 03:47:17 +0000 (20:47 -0700)]
Use @verbatim instead of @example for ASCII arts

Partially fixes #3869.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotexi2pod: Handle @verbatim
Timothy Gu [Fri, 10 Apr 2015 17:47:55 +0000 (10:47 -0700)]
texi2pod: Handle @verbatim

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