ffmpeg.git
4 years agoAdd 2.6 to maintained releases n2.7-dev
Michael Niedermayer [Fri, 6 Mar 2015 16:42:36 +0000 (17:42 +0100)]
Add 2.6 to maintained releases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: Fill in the xx
Michael Niedermayer [Fri, 6 Mar 2015 15:35:03 +0000 (16:35 +0100)]
doc/APIchanges: Fill in the xx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: Add 2.6 cut marker
Michael Niedermayer [Fri, 6 Mar 2015 15:20:52 +0000 (16:20 +0100)]
doc/APIchanges: Add 2.6 cut marker

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoChangelog: rename next to 2.6
Michael Niedermayer [Fri, 6 Mar 2015 15:19:58 +0000 (16:19 +0100)]
Changelog: rename next to 2.6

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/opencl: is_compiled flag not being cleared in av_opencl_uninit
Srikanth G [Thu, 5 Mar 2015 00:48:54 +0000 (18:48 -0600)]
avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit

When OpenCL kernels are compiled, is_compiled flag is being set for each
kernel. But, in opencl uninit, this flag is not being cleared.
This causes an error when an OpenCL kernel is tried on different OpenCL
devices on same platform.

Here is the patch with a fix

Reviewed-by; Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agochangelog: add mips 64-bit port
James Cowgill [Thu, 5 Mar 2015 17:40:16 +0000 (17:40 +0000)]
changelog: add mips 64-bit port

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips: port optimizations to mips n64
James Cowgill [Thu, 5 Mar 2015 17:40:15 +0000 (17:40 +0000)]
mips: port optimizations to mips n64

This mainly consists of replacing all the pointer arithmatic 'addiu'
instructions with PTR_ADDIU which will handle the differences in pointer
sizes when compiled on 64 bit mips systems.

The header asmdefs.h contains the PTR_ macros which expend to the correct mips
instructions to manipulate registers containing pointers.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure, mips: remove MIPS32R2, merging it with MIPSFPU
James Cowgill [Thu, 5 Mar 2015 17:40:14 +0000 (17:40 +0000)]
configure, mips: remove MIPS32R2, merging it with MIPSFPU

There are no independant uses of mips32r2 instructions except for the
FPU parts. Due to the heavy use of mips32r2 specifc fpu extensions, I
am guessing the original author intended MIPSFPU to imply MIPS32R2 anyway.

Since these fpu instructions are available on mips64 (non-r2), enable them
there as well.

Also remove the last occurence of HAVE_MIPS32R2 (which is coupled to
HAVE_MIPSFPU anyway).

mips32r2 is left in the list of options form compatability so that using
--disable-mips32r2 doesn't break anything.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/aacdec: remove uses of mips32r2 specific ext instructions
James Cowgill [Thu, 5 Mar 2015 17:40:13 +0000 (17:40 +0000)]
mips/aacdec: remove uses of mips32r2 specific ext instructions

Removing these removes the dependency of this code on mips32r2 which would
allow it to be used on processors which have FPU instructions, but not r2
instructions (like the mips64el debian port for instance).

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAAC: Add support for 7350Hz sampling rates, no error on too hight bitrate.
Claudio Freire [Fri, 6 Mar 2015 07:05:32 +0000 (04:05 -0300)]
AAC: Add support for 7350Hz sampling rates, no error on too hight bitrate.

Instead, warn that bitrate will be clamped down to the maximum allowed.

Patch is mostly work of Kamendo2 in issue #2686, quite tested within that issue.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'
Michael Niedermayer [Fri, 6 Mar 2015 11:13:05 +0000 (12:13 +0100)]
Merge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'

* commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b':
  dashenc: Update extradata for mov muxer

See: f5668e614bdccc19a3b3e3d3d67f7c7778526908
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6cf7f30655e95e27fd0394b5a80970d6f9517015'
Michael Niedermayer [Fri, 6 Mar 2015 10:56:18 +0000 (11:56 +0100)]
Merge commit '6cf7f30655e95e27fd0394b5a80970d6f9517015'

* commit '6cf7f30655e95e27fd0394b5a80970d6f9517015':
  dashenc: Simplify code by using a local variable

See: f5668e614bdccc19a3b3e3d3d67f7c7778526908
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'
Michael Niedermayer [Fri, 6 Mar 2015 10:31:19 +0000 (11:31 +0100)]
Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'

* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770':
  libopenh264enc: Add support for building with OpenH264 1.4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMAINTAINERS: Remove 1.2 from the maintained releases
Michael Niedermayer [Fri, 13 Feb 2015 16:16:26 +0000 (17:16 +0100)]
MAINTAINERS: Remove 1.2 from the maintained releases

The only distribution which still uses it according to
https://trac.ffmpeg.org/wiki/Downstreams is "gentoo stable", but
http://packages.gentoo.org/package/media-video/ffmpeg lists stable as shipping 1.2.6 which is 6 point
releases behind. Also gentoos ffmpeg maintainer stated "don't worry about gentoo: we're in the process
of moving to latest 2.2 for stable."

CC: Alexis Ballier <aballier@gentoo.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodashenc: Update extradata for mov muxer
Timo Rothenpieler [Wed, 4 Mar 2015 21:48:43 +0000 (22:48 +0100)]
dashenc: Update extradata for mov muxer

The mov muxer already supports picking up extradata that wasn't
present during the avformat_write_header call - we just need to
propagate it. Since the dash muxer uses delay_moov, we have time
up until the first segment is written to get extradata filled in.

Also update the codec description string when the extradata becomes
available.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodashenc: Simplify code by using a local variable
Timo Rothenpieler [Wed, 4 Mar 2015 21:48:43 +0000 (22:48 +0100)]
dashenc: Simplify code by using a local variable

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibopenh264enc: Add support for building with OpenH264 1.4
Martin Storsjö [Thu, 5 Mar 2015 11:57:44 +0000 (13:57 +0200)]
libopenh264enc: Add support for building with OpenH264 1.4

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agowebp: ensure that each transform is only used once
Andreas Cadhalpun [Thu, 5 Mar 2015 21:48:28 +0000 (22:48 +0100)]
webp: ensure that each transform is only used once

According to the WebP Lossless Bitstream Specification
"each transform is allowed to be used only once".

If a transform is more than once this can lead to memory
corruption.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '88b160a457e491cb9e014630ef5387ad3500258e'
Michael Niedermayer [Fri, 6 Mar 2015 00:04:19 +0000 (01:04 +0100)]
Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

* commit '88b160a457e491cb9e014630ef5387ad3500258e':
  avfilter: Return more meaningful error codes

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/avfoundation: Add support for 24 and 32bit integer input.
John Robinson [Fri, 6 Mar 2015 00:10:16 +0000 (01:10 +0100)]
lavd/avfoundation: Add support for 24 and 32bit integer input.

Tested on Mac Mini soundflower and built-in line input.

Reviewed-by: Thilo Borgmann
4 years agolavd/avfoundation: Add support for 16bit integer input.
Carl Eugen Hoyos [Fri, 6 Mar 2015 00:06:57 +0000 (01:06 +0100)]
lavd/avfoundation: Add support for 16bit integer input.

Reviewed-by: Thilo Borgmann
4 years agohls: detect SAMPLE-AES encryption
selsta [Thu, 5 Mar 2015 18:49:57 +0000 (19:49 +0100)]
hls: detect SAMPLE-AES encryption

SAMPLE-AES encryption is not commonly used yet, but without this patch
ffmpeg is thinking that the hls segments are not encrypted which
produces broken files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoDrop outdated RELEASE_NOTES
Clément Bœsch [Thu, 5 Mar 2015 21:25:10 +0000 (22:25 +0100)]
Drop outdated RELEASE_NOTES

A new RELEASE_NOTES specific to the release will be added.

4 years agoMerge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'
Michael Niedermayer [Thu, 5 Mar 2015 19:55:56 +0000 (20:55 +0100)]
Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'

* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
  h264: remove a now redundant error check

Conflicts:
libavcodec/h264_slice.c

See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c73c3c34fe72bb06966450207917ce902146b172'
Michael Niedermayer [Thu, 5 Mar 2015 19:32:18 +0000 (20:32 +0100)]
Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'

* commit 'c73c3c34fe72bb06966450207917ce902146b172':
  avformat/adxdec: set avctx->channels in adx_read_header

See: 7faa40af982960608b117e20fec999b48011e5e0
See: 64ea4a0598e7ca61b95cf6c93fd409151a448001
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'
Michael Niedermayer [Thu, 5 Mar 2015 19:24:27 +0000 (20:24 +0100)]
Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'

* commit 'bb4edddd9389cc1601db618ed3c1375b62628d04':
  rmenc: limit packet size

Conflicts:
libavformat/rmenc.c

See: 08728f400b8367dc8c983036cb2eff3a2891322b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4f2ee9daeedec636fb4fe953a1e0990a7102d5eb'
Michael Niedermayer [Thu, 5 Mar 2015 18:51:43 +0000 (19:51 +0100)]
Merge commit '4f2ee9daeedec636fb4fe953a1e0990a7102d5eb'

* commit '4f2ee9daeedec636fb4fe953a1e0990a7102d5eb':
  webp: validate the distance prefix code

See: 5de2dab12b951b2fe121eb18503accfc91cd1565
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'
Michael Niedermayer [Thu, 5 Mar 2015 18:41:10 +0000 (19:41 +0100)]
Merge commit '66624ed6319cb1a959256fe1a717fec5b748fbfa'

* commit '66624ed6319cb1a959256fe1a717fec5b748fbfa':
  rv10: check size of s->mb_width * s->mb_height

Conflicts:
libavcodec/rv10enc.c

See: 2578a546183da09d49d5bba8ab5e982dece1dede
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/avidec: Check avio_read() return before using the results for meta-data
Michael Niedermayer [Thu, 5 Mar 2015 18:31:56 +0000 (19:31 +0100)]
avformat/avidec: Check avio_read() return before using the results for meta-data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: Return more meaningful error codes
Himangi Saraogi [Mon, 23 Feb 2015 04:21:16 +0000 (09:51 +0530)]
avfilter: Return more meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoavformat/avidec: initialize header array
Michael Niedermayer [Thu, 5 Mar 2015 17:29:50 +0000 (18:29 +0100)]
avformat/avidec: initialize header array

Fixes use of uninitialized memory in case read fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoh264: remove a now redundant error check
Anton Khirnov [Tue, 27 Jan 2015 11:31:24 +0000 (12:31 +0100)]
h264: remove a now redundant error check

It was only relevant when data partitioning was in use.

4 years agoavfilter/vf_paletteuse: indent fix after 7ccc5848
Clément Bœsch [Thu, 5 Mar 2015 15:04:20 +0000 (16:04 +0100)]
avfilter/vf_paletteuse: indent fix after 7ccc5848

4 years agoavfilter/vf_paletteuse: Use int where AVERROR can be returned
Michael Niedermayer [Thu, 5 Mar 2015 14:52:00 +0000 (15:52 +0100)]
avfilter/vf_paletteuse: Use int where AVERROR can be returned

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/adxdec: set avctx->channels in adx_read_header
Andreas Cadhalpun [Thu, 26 Feb 2015 00:06:57 +0000 (01:06 +0100)]
avformat/adxdec: set avctx->channels in adx_read_header

It is used in adx_read_packet, which currently depends on the
decoder/parser setting this value between reading the file header and
demuxing the first packet.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agormenc: limit packet size
Andreas Cadhalpun [Mon, 2 Mar 2015 15:52:26 +0000 (16:52 +0100)]
rmenc: limit packet size

The chunk size is limited to UINT16_MAX (written by avio_wb16), so make
sure that the packet size is not too large.

Such large frames need to be split into slices smaller than 64 kB, but
that is currently supported neither by the rv10/rv20 encoders nor the rm
muxer.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agowebp: validate the distance prefix code
Andreas Cadhalpun [Mon, 2 Mar 2015 19:47:57 +0000 (20:47 +0100)]
webp: validate the distance prefix code

According to the WebP Lossless Bitstream Specification the highest
allowed value for a prefix code is 39.

If prefix_code is too large, the calculated extra_bits has an invalid
value and triggers an assertion in get_bits.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agorv10: check size of s->mb_width * s->mb_height
Andreas Cadhalpun [Tue, 3 Mar 2015 20:31:15 +0000 (21:31 +0100)]
rv10: check size of s->mb_width * s->mb_height

If it doesn't fit into 12 bits it triggers an assertion.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoavutil/opt: Do not print inf in selftest
Michael Niedermayer [Thu, 5 Mar 2015 12:50:22 +0000 (13:50 +0100)]
avutil/opt: Do not print inf in selftest

This fixes fate failures on windows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate-aac-aref-encode: increase FUZZ to 5, needed for ppc64be
Michael Niedermayer [Thu, 5 Mar 2015 12:12:48 +0000 (13:12 +0100)]
fate-aac-aref-encode: increase FUZZ to 5, needed for ppc64be

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/float_dsp: fix a bug in vector_fmul_window_mips
Nedeljko Babic [Thu, 5 Mar 2015 11:23:59 +0000 (12:23 +0100)]
mips/float_dsp: fix a bug in vector_fmul_window_mips

Loop was unrolled eight times although in heder there is assumption
that len is multiple of 4.
This is fixed, and assembly code is rewritten to be more optimal and
to simplify clobber list.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Add support for writing 'gama' atom to QuickTime .mov files.
Kevin Wheatley [Thu, 5 Mar 2015 10:40:13 +0000 (10:40 +0000)]
avformat/movenc: Add support for writing 'gama' atom to QuickTime .mov files.

As this is depricated it should not be on by default, it is only
supported for MOV containers, depends on avpriv_get_gamma_from_trc()

Enable by:

-movflags +write_gama

This will use the color_trc to supply a gamma value, if desired an
explicit value may be supplied using the -mov_gamma option supplying
a suitable floating point value, values <=1e-6 will not be written.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: Extract gamma determination from PNG encoder for future use. Adds private...
Kevin Wheatley [Thu, 5 Mar 2015 10:37:51 +0000 (10:37 +0000)]
avutil: Extract gamma determination from PNG encoder for future use. Adds private avpriv_get_gamma_from_trc() function to libavutil.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/protocols/tcp: fix units of listen_timeout option value, from microseconds to...
Stefano Sabatini [Thu, 5 Mar 2015 11:05:17 +0000 (12:05 +0100)]
doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds

s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout
value expressed in milliseconds.

The unit was incorrectly set in 1b4da43ce02452843a1e9bb976da1a39e18a945c.

4 years agoavformat/mxfdec: Detect XYZ pixel format for digital cinema files
Vilius Grigaliūnas [Wed, 4 Mar 2015 22:36:50 +0000 (00:36 +0200)]
avformat/mxfdec: Detect XYZ pixel format for digital cinema files

While the native jpeg2000 decoder can determine pixel format correctly
from the codestream, libopenjpeg wrapper cannot. To make sure that
the output is correct when using libopenjpeg to decode digital
cinema files, we do detection from the metadata included in the MXF
wrapper.

If the container has "JPEG 2000 Coding Parameters" metadata element
with Rsiz value set to one of digital cinema profiles, we can safely
assume that the given input file is DCI compliant, therefore the
pixel format should be XYZ.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dashenc: Update extradata for mov muxer
Timo Rothenpieler [Wed, 4 Mar 2015 21:48:43 +0000 (22:48 +0100)]
avformat/dashenc: Update extradata for mov muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'
Michael Niedermayer [Thu, 5 Mar 2015 09:10:23 +0000 (10:10 +0100)]
Merge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'

* commit '9c09fbd8053292267cdc4b542913ceced43ea3a9':
  rtpdec: experimental VP9 depacketizer (draft 0)

Conflicts:
libavformat/rtpdec.c
libavformat/rtpdec_vp9.c
libavformat/version.h

See: e4a6486c17dd90b338450ac7e151ffbf5370948a
See: f966ac2b6e3f08c41f3c45ab5efff768db62ac5a
See: 629a03a9128bd2e51286258e12183b1d06f509a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpdec: experimental VP9 depacketizer (draft 0)
Thomas Volkert [Tue, 3 Mar 2015 23:33:31 +0000 (00:33 +0100)]
rtpdec: experimental VP9 depacketizer (draft 0)

The code was tested with live555 server.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6'
Michael Niedermayer [Thu, 5 Mar 2015 01:16:50 +0000 (02:16 +0100)]
Merge commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6'

* commit 'f3b74d944bdef9bbe81f7690f8d837d843ec13a6':
  pcxenc: Return more meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'
Michael Niedermayer [Thu, 5 Mar 2015 00:40:03 +0000 (01:40 +0100)]
Merge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'

* commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac':
  rdt: Use a separate variable to clarify the different value namespaces

Conflicts:
libavformat/rdt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b'
Michael Niedermayer [Thu, 5 Mar 2015 00:19:52 +0000 (01:19 +0100)]
Merge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b'

* commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b':
  rtpdec_qt: Use a local variable instead of RTP_FLAG_KEY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '15621cbbe4ed88409ef40257afaf239487964e98'
Michael Niedermayer [Thu, 5 Mar 2015 00:12:13 +0000 (01:12 +0100)]
Merge commit '15621cbbe4ed88409ef40257afaf239487964e98'

* commit '15621cbbe4ed88409ef40257afaf239487964e98':
  rtpdec_asf: Don't set RTP_FLAG_KEY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/avformat: improve the text about headerless formats in avformat_flush()
Reimar Döffinger [Wed, 4 Mar 2015 22:13:35 +0000 (23:13 +0100)]
avformat/avformat: improve the text about headerless formats in avformat_flush()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: add avformat_flush()
wm4 [Tue, 30 Sep 2014 16:46:49 +0000 (18:46 +0200)]
avformat: add avformat_flush()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAllow AVFoundation compilation on OS X 10.7.
Carl Eugen Hoyos [Wed, 4 Mar 2015 22:54:10 +0000 (23:54 +0100)]
Allow AVFoundation compilation on OS X 10.7.

Fixes ticket #4238.

Reviewed-by: Thilo Borgmann
4 years agolavf/mxf: Support ProRes decoding.
Carl Eugen Hoyos [Wed, 4 Mar 2015 22:48:41 +0000 (23:48 +0100)]
lavf/mxf: Support ProRes decoding.

Fixes ticket #4349.

4 years agopcxenc: Return more meaningful error codes
Himangi Saraogi [Wed, 4 Mar 2015 15:44:04 +0000 (21:14 +0530)]
pcxenc: Return more meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agordt: Use a separate variable to clarify the different value namespaces
Martin Storsjö [Wed, 4 Mar 2015 08:00:08 +0000 (10:00 +0200)]
rdt: Use a separate variable to clarify the different value namespaces

The original flags variable contains rtpdec flags, while the
rmflags variable contains RM flag bits which have a completely
different definition.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_qt: Use a local variable instead of RTP_FLAG_KEY
Martin Storsjö [Wed, 4 Mar 2015 07:57:02 +0000 (09:57 +0200)]
rtpdec_qt: Use a local variable instead of RTP_FLAG_KEY

The only case where RTP_FLAG_KEY actually is needed is
in RDT, where such a flag needs to be passed via the
rtpdec parse function's flags parameter.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_asf: Don't set RTP_FLAG_KEY
Martin Storsjö [Wed, 4 Mar 2015 07:52:33 +0000 (09:52 +0200)]
rtpdec_asf: Don't set RTP_FLAG_KEY

Nothing in the framework nor in the rest of the depacketizer actually
uses this flag - the chained demuxer sets the keyframe flag properly on
demuxed packets already.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat/movenc: mark write_colr as experimental
Michael Niedermayer [Wed, 4 Mar 2015 21:36:23 +0000 (22:36 +0100)]
avformat/movenc: mark write_colr as experimental

This way the flag can be flipped to a nowrite_colr, if people prefer that

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibx264: update AQ options help for x264 build 144
Peter Cordes [Thu, 29 Jan 2015 21:24:45 +0000 (17:24 -0400)]
libx264: update AQ options help for x264 build 144

Regular autovariance is no longer "experimental", and a version of it with
bias towards dark scenes is now in mainline x264.

Signed-off-by: Peter Cordes <peter@cordes.ca>
4 years agopixelutils: Comment on (lack of) sad_8x8_sse2
Peter Cordes [Thu, 29 Jan 2015 21:20:27 +0000 (17:20 -0400)]
pixelutils: Comment on (lack of) sad_8x8_sse2

Signed-off-by: Peter Cordes <peter@cordes.ca>
4 years agopixelutils: indent comments in pixdesc.h to be clearer
Peter Cordes [Thu, 29 Jan 2015 21:19:39 +0000 (17:19 -0400)]
pixelutils: indent comments in pixdesc.h to be clearer

Signed-off-by: Peter Cordes <peter@cordes.ca>
4 years agovf_showinfo: minimum widths for some early fields
Peter Cordes [Thu, 15 Jan 2015 03:06:51 +0000 (23:06 -0400)]
vf_showinfo: minimum widths for some early fields

Depending on FPS, the pts_time string often changes length:
... pts_time:36.1 ...
... pts_time:36.1333 ...
etc.

 The length changes make the output bounce around horribly, making it
hard to scan down a column farther right than pts_time.

The solution is to set minimum widths for n, pts, pts_time, and pos.
This patch doesn't touch any of the fields in mean / stddev.

 The widths aren't intended to be wide enough that they're never
exceeded, but you'll see only an occasional ripple to a new alignment,
rather than bouncing.  (Some fields, like pos, increase monotonically,
which is why I left the minimum width for the field be smaller than it
often gets to.)

Signed-off-by: Peter Cordes <peter@cordes.ca>
4 years agoMerge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'
Michael Niedermayer [Wed, 4 Mar 2015 19:42:33 +0000 (20:42 +0100)]
Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'

* commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5':
  flv: Validate and reject unsupported codecs

Conflicts:
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'
Michael Niedermayer [Wed, 4 Mar 2015 18:48:28 +0000 (19:48 +0100)]
Merge commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15'

* commit '87e85a133f3ce2f037b90e9c7bbca99951df6c15':
  aac: Relax reserved_bit validation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '25f613f8be3b51e4396b93cda131e4631ba54302'
Michael Niedermayer [Wed, 4 Mar 2015 18:24:12 +0000 (19:24 +0100)]
Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'

* commit '25f613f8be3b51e4396b93cda131e4631ba54302':
  dca: Move syncword definitions to a separate header

Conflicts:
libavcodec/dca_parser.c
libavformat/dtsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1dc19729e92a96620000e09eba8e58cb458c9486'
Michael Niedermayer [Wed, 4 Mar 2015 18:14:45 +0000 (19:14 +0100)]
Merge commit '1dc19729e92a96620000e09eba8e58cb458c9486'

* commit '1dc19729e92a96620000e09eba8e58cb458c9486':
  rtpdec_asf: Don't free the payload context in the .close function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '62139b14e621f096d0f8ed90920d042b92867e40'
Michael Niedermayer [Wed, 4 Mar 2015 18:05:28 +0000 (19:05 +0100)]
Merge commit '62139b14e621f096d0f8ed90920d042b92867e40'

* commit '62139b14e621f096d0f8ed90920d042b92867e40':
  fate: Specify the idct to use for the aic-oddsize test

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoflv: Validate and reject unsupported codecs
Luca Barbato [Tue, 3 Mar 2015 13:39:26 +0000 (14:39 +0100)]
flv: Validate and reject unsupported codecs

And provide a more informative message in case of failure.

CC: libav-stable@libav.org
4 years agoaac: Relax reserved_bit validation
Vittorio Giovara [Tue, 3 Mar 2015 19:38:32 +0000 (19:38 +0000)]
aac: Relax reserved_bit validation

Although the specification mandates this bit to zero, it may happen
that software tools incorrectly flip it to one, invalidating a possibly
valid stream.

Relax this restriction, by failing only when AV_EF_BITSTREAM is set.
This behaviour is similar to aac decoders in Firefox and Quicktime.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodca: Move syncword definitions to a separate header
Diego Biurrun [Wed, 25 Feb 2015 12:50:15 +0000 (13:50 +0100)]
dca: Move syncword definitions to a separate header

4 years agolibavformat/mxfdec: refactor reading strong ref array
Mark Reid [Mon, 2 Mar 2015 02:33:10 +0000 (18:33 -0800)]
libavformat/mxfdec: refactor reading strong ref array

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpdec_asf: Don't free the payload context in the .close function
Martin Storsjö [Wed, 4 Mar 2015 07:50:44 +0000 (09:50 +0200)]
rtpdec_asf: Don't free the payload context in the .close function

This was missed in bb4a310bb. This fixes a double free on close.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agofate: Specify the idct to use for the aic-oddsize test
Martin Storsjö [Wed, 4 Mar 2015 07:31:16 +0000 (09:31 +0200)]
fate: Specify the idct to use for the aic-oddsize test

This fixes fate on all architectures that have an optimized
but not bitexact idct available.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'
Michael Niedermayer [Wed, 4 Mar 2015 10:15:05 +0000 (11:15 +0100)]
Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'

* commit '2a66a580678dd9401f4d95e01e0958ca51864b6f':
  rtpdec_mpa_robust: Fix incrementing split_pos

Conflicts:
libavformat/rtpdec_mpa_robust.c

See: ebf1f512e9916040dd96fa9f789ed4be5a39c349
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpdec_mpa_robust: Fix incrementing split_pos
Martin Storsjö [Mon, 2 Mar 2015 12:46:30 +0000 (14:46 +0200)]
rtpdec_mpa_robust: Fix incrementing split_pos

This fixes an oversight in 96084251, in a refactoring done on top
of Gilles' original patch.

Pointed out by Gilles Chanteperdrix.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoffplay: Switch to show waves mode if allocation/init of RDFT fails
Michael Niedermayer [Mon, 2 Mar 2015 13:19:41 +0000 (14:19 +0100)]
ffplay: Switch to show waves mode if allocation/init of RDFT fails

Fixes null pointer dereference

Found-by: Paweł <pantrombka@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pngenc: Remove outer () from macro
Michael Niedermayer [Wed, 4 Mar 2015 01:06:08 +0000 (02:06 +0100)]
avcodec/pngenc: Remove outer () from macro

The macro is implemented as a do{}while()
enclosing this is () appears to be a GNU extension (6.1 Statements and Declarations in Expressions)
the () is also unneeded and wrong as the macro returns no
value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'
Michael Niedermayer [Wed, 4 Mar 2015 00:23:26 +0000 (01:23 +0100)]
Merge commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24'

* commit 'db5cc75f8b5620e7cd2d05762c3b087ab16d8c24':
  wma.h: #include "avcodec.h"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/avienc: Fix duration of audio segment in OpenDML master index
Tobias Rapp [Tue, 3 Mar 2015 12:29:05 +0000 (13:29 +0100)]
libavformat/avienc: Fix duration of audio segment in OpenDML master index

Fixes the duration field of the OpenDML master index "indx" chunk to
contain the number of samples instead of the number of packets for
(linear/PCM) audio streams.

This matches the OpenDML V1.02 standard text which states that the
duration field shall contain "time span in stream ticks".

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoacvodec/lipopenjpeg: Fix pixel value shift for 12-bit pixel formats
Vilius Grigaliūnas [Tue, 3 Mar 2015 08:19:47 +0000 (10:19 +0200)]
acvodec/lipopenjpeg: Fix pixel value shift for 12-bit pixel formats

This fixes pixel values not being properly shifted in
libopenjpeg_copyto16 and libopenjpeg_copy_to_packed16 methods.

Pixel formats like xyz12le need to be shifted by AVComponentDescriptor::shift
to get the correct values.

Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/aaccoder: use variables instead of using register names directly
James Cowgill [Thu, 26 Feb 2015 13:42:53 +0000 (13:42 +0000)]
mips/aaccoder: use variables instead of using register names directly

On mips64, the registers t[4-7] do not exist. Instead of using a lot of #ifdef
or defines to handle differing register names, use variables and let GCC
allocate the registers automatically (like in the other mips assembly files).

In get_band_cost_ESC_mips, t4 and t5 were renamed to t6 and t7 to avoid a
variable name conflict.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips: use float* to hold pointer instead of int
James Cowgill [Thu, 26 Feb 2015 13:42:51 +0000 (13:42 +0000)]
mips: use float* to hold pointer instead of int

This is obviously needed for 64-bit support.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'
Michael Niedermayer [Tue, 3 Mar 2015 20:16:31 +0000 (21:16 +0100)]
Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'

* commit '0af3b65880573aa9b3375362eaab4f84140c7dde':
  asf: do not export XMP metadata by default

Conflicts:
libavformat/asfdec.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '994d8f3095180ba1b2c6040a97718e931a782b34'
Michael Niedermayer [Tue, 3 Mar 2015 19:54:17 +0000 (20:54 +0100)]
Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'

* commit '994d8f3095180ba1b2c6040a97718e931a782b34':
  fate: Add AIC test with odd sizes

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowma.h: #include "avcodec.h"
Anton Khirnov [Mon, 2 Mar 2015 20:51:02 +0000 (21:51 +0100)]
wma.h: #include "avcodec.h"

It's required for at least AVCodecContext.

Fixes make checkheaders.

4 years agoMerge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'
Michael Niedermayer [Tue, 3 Mar 2015 19:20:49 +0000 (20:20 +0100)]
Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'

* commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255':
  aic: Fix decoding files with odd dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: comment mpeg4 hack
Clément Bœsch [Tue, 3 Mar 2015 19:24:41 +0000 (20:24 +0100)]
ffmpeg: comment mpeg4 hack

See 3734c3ea51ae002a85366ee52dbc8f9df4cfd3db

4 years agolibavformat/avio: added avio_put_str16be
Mark Reid [Tue, 3 Mar 2015 04:06:13 +0000 (20:06 -0800)]
libavformat/avio: added avio_put_str16be

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoasf: do not export XMP metadata by default
Vittorio Giovara [Mon, 2 Mar 2015 18:04:03 +0000 (18:04 +0000)]
asf: do not export XMP metadata by default

Similarly to what has been done for MOV, display XMP metadata only when
users explicitly require it.

The Extensible Metadata Platform tag can contain various kind of data
which are not strictly related to the video file, such as history of
edits and saves from the project file.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agofate: Add AIC test with odd sizes
Vittorio Giovara [Mon, 2 Mar 2015 13:03:39 +0000 (13:03 +0000)]
fate: Add AIC test with odd sizes

4 years agoaic: Fix decoding files with odd dimensions
Vittorio Giovara [Fri, 27 Feb 2015 19:00:25 +0000 (19:00 +0000)]
aic: Fix decoding files with odd dimensions

Normally the aic decoder finds the proper slice combination (multiple of
some number less than 32) but in case of odd width, it resorts to the
default values, which were actually swapped.
The number of slices is modified to account for such odd width cases.

CC: libav-stable@libav.org
4 years agoAAC: Fix M/S stereo encoding
Claudio Freire [Tue, 3 Mar 2015 06:43:06 +0000 (03:43 -0300)]
AAC: Fix M/S stereo encoding

This patch fixes a pointer arithmetic bug in adjust_frame_information that resulted in heavily corrupted audio when using M/S encoding. Also, a backup copy of untransformed coefficients has to be kept around or attempts at re-processing the frame (which happens when hevavily overspending bits during transients) will result in re-encoding of the coefficients and subsequent corruption of the resulting stream.

A/B testing shows the bug as corrected, but still cannot prove that M/S coding is a win at least in numbers. Limited listening tests do show improvement on M/S encoded samples in lower bitrates, but they're hidden among the other artifacts that remain to be corrected in the encoder.

Some of the regressions flagged in the report do show poor stereo image (but not buggy), so M/S encoding is clearly not good enough yet to be defaulted to auto.

In numbers, Patched against Unpatched, stereo_mode auto:

  Files: 114
  Bitrates: 6
  Tests: 683

  Serious Regressions: 0 (0%)
  Regressions: 0 (0%)
  Improvements: 227 (33%)
  Big improvements: 92 (13%)
  Worst regression - mybloodrusts.wv - 256k
    - StdDev: 28.61       pSNR: -0.43     maxdiff: 1372.00
  Best improvement - 60.wv - 384k
    - StdDev: -369.57     pSNR: 45.02     maxdiff: -13322.00
  Average          - StdDev: -80.56       pSNR: 2.49      maxdiff: -8858.00

Patched against Unpatched stereo_mode ms_off shows no difference.

Patched stereo_mode auto vs Unpatched stereo_mode ms_off shows a small average improvement, just not too significant:

  Serious Regressions: 0 (0%)
  Regressions: 10 (1%)
  Improvements: 45 (6%)
  Big improvements: 2 (0%)
  Worst regression - Illinois.wv - 256k
    - StdDev: 33.20       pSNR: -2.03     maxdiff: 477.00
  Best improvement - song_of_circomstances.flac - 384k
    - StdDev: -3.97       pSNR: 7.61      maxdiff: -826.00
  Average          - StdDev: -10.25       pSNR: 0.20      maxdiff: -281.00

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofix VP9 packet decoder returning 0 instead of the used data size
Steve Lhomme [Tue, 3 Mar 2015 11:06:40 +0000 (12:06 +0100)]
fix VP9 packet decoder returning 0 instead of the used data size

See https://trac.videolan.org/vlc/ticket/14022#comment:6

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/rv10: check size of s->mb_width * s->mb_height
Andreas Cadhalpun [Mon, 2 Mar 2015 19:27:26 +0000 (20:27 +0100)]
avcodec/rv10: check size of s->mb_width * s->mb_height

If it doesn't fit into 12 bits it triggers an assertion.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxfenc: adjust product name when opatom muxer is used
Robert Krüger [Sun, 1 Mar 2015 12:02:20 +0000 (13:02 +0100)]
avformat/mxfenc: adjust product name when opatom muxer is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/webp: validate the distance prefix code
Andreas Cadhalpun [Mon, 2 Mar 2015 19:47:57 +0000 (20:47 +0100)]
avcodec/webp: validate the distance prefix code

According to the WebP Lossless Bitstream Specification the highest
allowed value for a prefix code is 39.

If prefix_code is too large, the calculated extra_bits has an invalid
value and triggers an assertion in get_bits.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/proresenc_kostya: fix coded_frame handling
Clément Bœsch [Mon, 2 Mar 2015 19:55:16 +0000 (20:55 +0100)]
avcodec/proresenc_kostya: fix coded_frame handling