ffmpeg.git
5 years agoUpdate Changelog
John Stebbins [Mon, 3 Mar 2014 20:20:14 +0000 (20:20 +0000)]
Update Changelog

5 years agoarm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

CC: libav-stable@libav.org
(cherry picked from commit 61985ad72c47bbb668f2d3923bf5c9df83e79323)

5 years agoarm: hpeldsp: prevent overreads in armv6 asm
Janne Grunau [Wed, 5 Mar 2014 11:44:57 +0000 (12:44 +0100)]
arm: hpeldsp: prevent overreads in armv6 asm

Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>

Bug-Id: 646
CC: libav-stable@libav.org
(cherry picked from commit cbddee1cca0ebd01e8c5aa694d31228eb4de4b41)

5 years agoavfilter: Add missing emms_c when needed
Luca Barbato [Wed, 5 Mar 2014 09:41:33 +0000 (10:41 +0100)]
avfilter: Add missing emms_c when needed

Arch specific calls should have an emms_c following to keep the cpu
state consistent.

Reported-By: wm4
CC: libav-stable@libav.org
(cherry picked from commit e995cf1bccc6e91bbaa6a8771e23fb3ab259c110)

5 years agoUpdate Changelog for v10.1
Reinhard Tartler [Sat, 10 May 2014 14:05:03 +0000 (10:05 -0400)]
Update Changelog for v10.1

5 years agoAdd missing changelog entries for v10
Reinhard Tartler [Sat, 10 May 2014 14:01:31 +0000 (10:01 -0400)]
Add missing changelog entries for v10

5 years agortmpproto: Check the buffer sizes when copying app/playpath strings
Martin Storsjö [Thu, 8 May 2014 12:12:23 +0000 (15:12 +0300)]
rtmpproto: Check the buffer sizes when copying app/playpath strings

As pointed out by Reimar Döffinger.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e)

Conflicts:
libavformat/rtmpproto.c

5 years agoswscale: Fix an undefined behaviour
Luca Barbato [Thu, 1 May 2014 22:21:23 +0000 (00:21 +0200)]
swscale: Fix an undefined behaviour

Prevent a division by zero down the codepath.

Sample-Id: 00001721-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 3a177a9cca924e097265b32f9282814f6b653e08)

5 years agovp9: Read the frame size as unsigned
Luca Barbato [Thu, 1 May 2014 22:18:04 +0000 (00:18 +0200)]
vp9: Read the frame size as unsigned

Sample-Id: 00001723-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 925c37874b617816b6f460c6f229c18b46548b46)

5 years agodcadec: Use correct channel count in stereo downmix check
Tim Walker [Sat, 12 Apr 2014 20:11:53 +0000 (22:11 +0200)]
dcadec: Use correct channel count in stereo downmix check

s->prim_channels is greater than num_core_channels
when an XCh extension is present in the bitstream.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 801c39e1e3058fc4ba822bfb5d8612d777111e32)

5 years agodcadec: Do not decode the XCh extension when downmixing to stereo
Tim Walker [Sat, 12 Apr 2014 20:11:52 +0000 (22:11 +0200)]
dcadec: Do not decode the XCh extension when downmixing to stereo

This is neither necessary nor currently supported.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit c8cf461c19e8e35df4b7364d9b90aa42f1ab4560)

5 years agomatroska: add the Opus mapping
Anton Khirnov [Sun, 27 Apr 2014 11:40:11 +0000 (13:40 +0200)]
matroska: add the Opus mapping

(cherry picked from commit 141fdc763c2841b572d29a2ad78513e8d5325870)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agomatroskadec: read the CodecDelay element
Anton Khirnov [Tue, 29 Apr 2014 10:03:13 +0000 (12:03 +0200)]
matroskadec: read the CodecDelay element

(cherry picked from commit eb3b5501e8b85bfea09d533314cb6920efc42639)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:
libavformat/matroskadec.c

5 years agortmpproto: Make sure to pass on the error code if read_connect failed
Martin Storsjö [Sun, 13 Apr 2014 10:44:03 +0000 (13:44 +0300)]
rtmpproto: Make sure to pass on the error code if read_connect failed

Previously, if read_connect failed, the ret variable was unmodified
and had the value 0, indicating success, which then was returned from
the rtmp_open function, even though it actually failed.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6477139721f559b26eafd415e23e13ea2b0c27e1)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agolavr: allocate the resampling buffer with a positive size
Anton Khirnov [Thu, 20 Mar 2014 19:40:24 +0000 (20:40 +0100)]
lavr: allocate the resampling buffer with a positive size

This fixes cases where very few input samples (fewer than needed for one
output sample) are passed to lavr at the beginning.
CC:libav-stable@libav.org

(cherry picked from commit ac976ed91e323754e9a84509873ebdb437372797)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agomp3enc: Properly write bitrate value in XING header
Michael Niedermayer [Wed, 9 Apr 2014 16:22:53 +0000 (18:22 +0200)]
mp3enc: Properly write bitrate value in XING header

Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.

Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.

Bug-Id: https://bugs.debian.org/736088

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 617a1a98a6be3e59db6fbfc21afab2fb9a049c03)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
5 years agogolomb: Fix the implementation of get_se_golomb_long
Martin Storsjö [Sat, 29 Mar 2014 10:35:11 +0000 (12:35 +0200)]
golomb: Fix the implementation of get_se_golomb_long

This was only used in hevc muxing code so far.

This makes the return values match what get_se_golomb returns for
the same bitstream reader instances.

The logic for producing a signed golomb code out of an unsigned one
was based on the corresponding code in get_se_golomb, which operated
directly on the bitstream reader buffer - not on the equivalent
return value from get_ue_golomb.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 508a84e6726ab94a740c160b30fd8162265d1fef)
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoPrepare for 10.1 Release
Reinhard Tartler [Sat, 29 Mar 2014 17:03:59 +0000 (13:03 -0400)]
Prepare for 10.1 Release

5 years agoRELEASE_NOTES: mention new filters
Vittorio Giovara [Sun, 23 Mar 2014 16:28:34 +0000 (17:28 +0100)]
RELEASE_NOTES: mention new filters

5 years agoaf_channelmap: fix ONE_STR mapping mode
Anton Khirnov [Tue, 4 Mar 2014 06:19:46 +0000 (07:19 +0100)]
af_channelmap: fix ONE_STR mapping mode

get_channel() returns 0 on success

CC:libav-stable@libav.org
(cherry picked from commit e843612695007cc623813073754c651ab43021f7)

5 years agoPrepare for 10 Release
Reinhard Tartler [Sun, 23 Mar 2014 15:38:38 +0000 (11:38 -0400)]
Prepare for 10 Release

5 years agomovenc: Allow override of major brand in ftyp atom
John Stebbins [Tue, 18 Mar 2014 13:11:00 +0000 (13:11 +0000)]
movenc: Allow override of major brand in ftyp atom

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
(cherry picked from commit 1e9db41e2a2166be5671b088ef4ad06a40af459f)

5 years agomatroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Tim Walker [Mon, 3 Mar 2014 14:53:45 +0000 (14:53 +0000)]
matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

(cherry picked from commit 558b20d729bc296d8e6a69f03cd509ad26a4827d)

5 years agomatroskaenc: write private data in hvcC format for HEVC.
Tim Walker [Mon, 3 Mar 2014 14:53:44 +0000 (14:53 +0000)]
matroskaenc: write private data in hvcC format for HEVC.

(cherry picked from commit a823d0948683bd97dd58556b5740e434166209a8)

5 years agodoc: Point to the correct, actually maintained gas-preprocessor repo
Martin Storsjö [Wed, 12 Mar 2014 11:46:04 +0000 (13:46 +0200)]
doc: Point to the correct, actually maintained gas-preprocessor repo

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d15c536123a44362ace6299c391a492c90b83fc7)
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarmv6: vp8: use explicit labels in motion compensation asm
Janne Grunau [Mon, 10 Mar 2014 22:58:35 +0000 (23:58 +0100)]
armv6: vp8: use explicit labels in motion compensation asm

The integrated arm assembler in clang-503.0.38 (Xcode-5.1) seems
to get confused by the offset of 4 and decides to use a non-wide
thumb encoding. That fails since the labels are out of range of
the limited offset a 16-bit thumb encoding offers.

5 years agohttp: Properly initialize icy headers string
Alessandro Ghedini [Wed, 12 Mar 2014 15:28:22 +0000 (16:28 +0100)]
http: Properly initialize icy headers string

The icy_metadata_headers string never gets initialized, so,
during the first call to av_strlcatf() in parse_icy(),
strlen() will be called on a pointer to uninitialized memory.
At best this causes some garbage data to be left at the
start of the string.

By initializing icy_metadata_headers to the empty string, the
first call to strlen() will always return 0, so that data is
appended from the start of the string.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 6998a9f4c4e069f515c50614179f4cfc7d0184f5)

5 years agohttp: Declare more parameters as const where possible
Martin Storsjö [Wed, 12 Mar 2014 07:40:05 +0000 (09:40 +0200)]
http: Declare more parameters as const where possible

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e77a2ea9505863e50bf013706f66bf8b7325e524)

5 years agohttp: Allow setting a Content-Type for POST requests
Clément Bœsch [Thu, 6 Mar 2014 17:40:03 +0000 (18:40 +0100)]
http: Allow setting a Content-Type for POST requests

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 2572d07c1f0abd9e2bf3ed20dbe35c58f1dd6ac4)

5 years agohttp: Improve options descriptions
Reinhard Tartler [Sat, 15 Mar 2014 13:51:57 +0000 (09:51 -0400)]
http: Improve options descriptions

Add documentation where missing.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit fe568b3d27ca2c5cca3878b2a7a3a968e605aec4)

Conflicts:
libavformat/http.c

5 years agohttp: Always allow no-op seek
Anssi Hannula [Thu, 6 Mar 2014 17:40:01 +0000 (18:40 +0100)]
http: Always allow no-op seek

This also allows checking stream position as per ffurl_seek() doxy.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab)

5 years agohttp: Add support for selecting a request range
Anssi Hannula [Thu, 6 Mar 2014 17:40:00 +0000 (18:40 +0100)]
http: Add support for selecting a request range

Comment from Reimar Döffinger included as pro memoria.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 2ec33d27127251bbc45e1f88e60691ad59cf2319)

5 years agohttp: Support setting custom User-Agent
Clément Bœsch [Thu, 6 Mar 2014 17:39:59 +0000 (18:39 +0100)]
http: Support setting custom User-Agent

Contextually make the default User-Agent use the common
"Name/Version" pattern.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ddfc98906373d1f17f6205cedd14c68d7a75995f)

5 years agohttp: Export Content-Type information
Michael Niedermayer [Thu, 6 Mar 2014 17:39:58 +0000 (18:39 +0100)]
http: Export Content-Type information

Bug-Id: https://bugs.debian.org/740421

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit e58c85b0686892960042232e51c77168b264838a)

5 years agohttp: Add support reading ICY metadata
Luca Barbato [Mon, 10 Mar 2014 20:11:35 +0000 (21:11 +0100)]
http: Add support reading ICY metadata

Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.

Bug-Id: https://bugs.debian.org/739936

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab)

5 years agohttp: Refactor process_line
Luca Barbato [Mon, 10 Mar 2014 19:16:50 +0000 (20:16 +0100)]
http: Refactor process_line

(cherry picked from commit 4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa)

5 years agohttp: K&R formatting cosmetics
Luca Barbato [Mon, 10 Mar 2014 17:02:09 +0000 (18:02 +0100)]
http: K&R formatting cosmetics

(cherry picked from commit 7a2fddb4480121712df560cf619c1c3566cae3ff)

5 years agohttp: Drop doxy comments
Luca Barbato [Mon, 10 Mar 2014 16:53:51 +0000 (17:53 +0100)]
http: Drop doxy comments

(cherry picked from commit 78b21c1d7177e1d61ad3c9225f67699da089aa7c)

5 years agohttp: Return meaningful error codes
Luca Barbato [Mon, 10 Mar 2014 16:17:25 +0000 (17:17 +0100)]
http: Return meaningful error codes

(cherry picked from commit 55a215ba63d9fa79cd7ee265ee2e777ee86b200c)

5 years agoconfigure: Support older version of openjpeg1
Luca Barbato [Wed, 12 Mar 2014 09:30:07 +0000 (09:30 +0000)]
configure: Support older version of openjpeg1

It should work best for debian stable and people not installing the .pc
file.

(cherry picked from commit aa807425395caa17a85ed2833133278e8bd44a76)

5 years agodoc: Add section about AviSynth support
Stephen Hutchinson [Tue, 14 Jan 2014 14:49:29 +0000 (09:49 -0500)]
doc: Add section about AviSynth support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 908836e20743d7e9462011a9f30a300a5bf247ca)

5 years agolavf: always use av_free
Michael Niedermayer [Mon, 10 Mar 2014 15:03:14 +0000 (15:03 +0000)]
lavf: always use av_free

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
(cherry picked from commit 77e9123fe5d64b0960158de6e1713d3c6c7878a7)

5 years agolavf: simplify ff_hevc_annexb2mp4_buf
Tim Walker [Mon, 10 Mar 2014 15:03:13 +0000 (15:03 +0000)]
lavf: simplify ff_hevc_annexb2mp4_buf

Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.

(cherry picked from commit 34bbc81de8a49fbddb92b76dc733f40890480b2b)

5 years agoconfigure: Use the right pkgconf file for openjpeg
Luca Barbato [Mon, 10 Mar 2014 10:48:04 +0000 (11:48 +0100)]
configure: Use the right pkgconf file for openjpeg

The current release of version 1 uses libopenjpeg1.

(cherry picked from commit 4a8562394b685e83ae4a38a93eef43625755a231)

5 years agohevc: Use get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:59:48 +0000 (10:59 +0100)]
hevc: Use get_se_golomb_long

Do not use inline functions that refer to tables present in other
libraries.

(cherry picked from commit ee17be3fdd37f63f4b77676820e387858908b0f4)

5 years agogolomb: Add a get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:57:51 +0000 (10:57 +0100)]
golomb: Add a get_se_golomb_long

Useful in libavformat mostly.

(cherry picked from commit 5eacbb53289570834f9a1acb15fd406ea224eef6)

5 years agovf_frei0r: adjust error messages
Vittorio Giovara [Thu, 27 Feb 2014 12:41:57 +0000 (13:41 +0100)]
vf_frei0r: adjust error messages

(cherry picked from commit 8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9)

5 years agovf_frei0r: prevent a segfault when filter parameters are not set
Vittorio Giovara [Thu, 27 Feb 2014 11:06:15 +0000 (12:06 +0100)]
vf_frei0r: prevent a segfault when filter parameters are not set

(cherry picked from commit 4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e)

5 years agovf_frei0r: fix missing end of line character
Vittorio Giovara [Tue, 4 Mar 2014 17:27:09 +0000 (18:27 +0100)]
vf_frei0r: fix missing end of line character

Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.

(cherry picked from commit 4c41a7a1798dd6c60e40f79be12faa98a9347151)

5 years agovf_frei0r: refactor library loading from env variable
Vittorio Giovara [Thu, 27 Feb 2014 11:29:37 +0000 (12:29 +0100)]
vf_frei0r: refactor library loading from env variable

strtok_r is not needed any more, so remove it from configure.

(cherry picked from commit 61b323ce7c7cdc101eadfd7de2203922b8a39e8d)

5 years agodoc: fix a couple of typos in frame.h
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
doc: fix a couple of typos in frame.h

(cherry picked from commit a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54)

5 years agoisom: lpcm in mov default to big endian
Mark Himsley [Fri, 1 Nov 2013 11:22:53 +0000 (11:22 +0000)]
isom: lpcm in mov default to big endian

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
(cherry picked from commit 360022bd3b894cc01ea112b275fa4c8f53881808)

5 years agomovdec: handle 0x7fff langcode as macintosh per the specs
Baptiste Coudurier [Wed, 21 Mar 2012 21:18:16 +0000 (14:18 -0700)]
movdec: handle 0x7fff langcode as macintosh per the specs

The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

(cherry picked from commit 9e71cc81f3655cacf0f91860fba3043f13b64059)

5 years agomovenc: allow muxing HEVC in MODE_MP4.
Tim Walker [Mon, 3 Mar 2014 14:53:43 +0000 (14:53 +0000)]
movenc: allow muxing HEVC in MODE_MP4.

(cherry picked from commit 4f3db5d3418a24f3b90422e98ad75388052c4284)

5 years agomovenc: enable Annex B to MP4 conversion for HEVC tracks.
Tim Walker [Mon, 3 Mar 2014 14:53:42 +0000 (14:53 +0000)]
movenc: enable Annex B to MP4 conversion for HEVC tracks.

(cherry picked from commit b6c61fb83e876d404ac3b0b3657ebfcafdcd1926)

5 years agomovenc: write hvcC tag for HEVC.
Tim Walker [Mon, 3 Mar 2014 14:53:41 +0000 (14:53 +0000)]
movenc: write hvcC tag for HEVC.

(cherry picked from commit 20b40a597cdd4969cf1147d7c7efee2b6232524b)

5 years agomovenc: use 'hev1' tag for HEVC in MODE_MOV.
Tim Walker [Mon, 3 Mar 2014 14:53:40 +0000 (14:53 +0000)]
movenc: use 'hev1' tag for HEVC in MODE_MOV.

'hvc1' requires that parameter set NAL units be
present only in the samples entry, but not in the
samples themselves, requiring that additional
parameter sets, if present, be filtered out of the
samples and placed in new, additional sample entries
if they override or otherwise conflict with the
parameter sets present in the first sample entry.
We do not have any way of doing this at present, so
the files we produce can only comply with the
restrictions set for the 'hev1' sample entry name in
ISO/IEC 14496-15.

(cherry picked from commit 1d9014f0b008485eac4c19d5f5e11ede59237167)

5 years agomovenc: Add a fallback fragmentation method for plain mp4 as well
Martin Storsjö [Tue, 18 Feb 2014 14:11:59 +0000 (16:11 +0200)]
movenc: Add a fallback fragmentation method for plain mp4 as well

Previously the default fragmentation method was only enabled
if writing an ISM file.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66)

5 years agohevc: make pps/sps ids unsigned where necessary
Vittorio Giovara [Sun, 9 Mar 2014 16:15:26 +0000 (17:15 +0100)]
hevc: make pps/sps ids unsigned where necessary

Fixes integer overflow and out of array accesses.
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
(cherry picked from commit 4d33873c2990b8d6096f60fef384f0efc4482b55)

5 years agohevc: Do not turn 32bit timebases into negative numbers
Michael Niedermayer [Sat, 15 Feb 2014 22:09:55 +0000 (23:09 +0100)]
hevc: Do not turn 32bit timebases into negative numbers

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit ed06e5d92b4c67b49068d538461fbbe0a53a8c5e)

5 years agohevc: use av_mallocz() for allocating tab_ipm
Michael Niedermayer [Sat, 11 Jan 2014 19:23:51 +0000 (20:23 +0100)]
hevc: use av_mallocz() for allocating tab_ipm

Fixes use of uninitialized memory and out of stack array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 6cc94e971933cd38c452172bb048bf760e65cc3e)

5 years agohevc: Use get_bits_long() in decode_vui()
Michael Niedermayer [Sat, 15 Feb 2014 21:29:17 +0000 (22:29 +0100)]
hevc: Use get_bits_long() in decode_vui()

Fix assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
(cherry picked from commit 920c01adce6c273fc043513ff237a6266e612152)

5 years agochangelog: Cleanups and prepare for v10_beta2
Reinhard Tartler [Sun, 9 Mar 2014 01:50:36 +0000 (20:50 -0500)]
changelog: Cleanups and prepare for v10_beta2

5 years agofloat_dsp: fix errors in documentation
Janne Grunau [Sun, 2 Mar 2014 19:33:49 +0000 (20:33 +0100)]
float_dsp: fix errors in documentation

(cherry picked from commit 74cc901905741ca3d9e8364f42239341f4f173c4)

5 years agoarm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Janne Grunau [Sat, 8 Mar 2014 18:15:16 +0000 (19:15 +0100)]
arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration

Was missed in aeaf268e52fc11c1f64914a319e0edddf1346d6a when integrating
clear_blocks into the idct.

(cherry picked from commit 4506a854a4d846692ba71daeeff661dc214c8fa2)

5 years agobuild: Use pkg-config for openjpeg
Pierre Lejeune [Sat, 8 Mar 2014 12:19:17 +0000 (12:19 +0000)]
build: Use pkg-config for openjpeg

Bug-Id: 387
CC: libav-stable@libav.org
(cherry picked from commit 0e0cefb22216a4b6684a30a50cb5973400dc59f2)

5 years agomovenc: allow override of "writing application" tag
John Stebbins [Mon, 3 Mar 2014 20:20:15 +0000 (20:20 +0000)]
movenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
(cherry picked from commit 565e0c6d866ce08d4b06427456d3d1f4fd856e9c)

5 years agomatroskaenc: allow override of "writing application" tag
John Stebbins [Mon, 3 Mar 2014 20:20:14 +0000 (20:20 +0000)]
matroskaenc: allow override of "writing application" tag

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
CC: libav-stable@libav.org
(cherry picked from commit 0092c1dd8dac2d9e185b58503b447a0d3fb5230d)

5 years agorv10: Forward error from rv10_decode_packet
Keiji Costantini [Sat, 1 Mar 2014 18:44:00 +0000 (19:44 +0100)]
rv10: Forward error from rv10_decode_packet

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit b4d372e091f6b30758db2a43a5a9fe2510ec2b13)

5 years agofic: Properly handle skip frames
Derek Buitenhuis [Fri, 7 Mar 2014 14:31:53 +0000 (14:31 +0000)]
fic: Properly handle skip frames

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
(cherry picked from commit f87a6e500bcdaede22a123b81a2a46779cf7b71a)

5 years agoarm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Janne Grunau [Sat, 8 Mar 2014 10:52:14 +0000 (11:52 +0100)]
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6

The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.

5 years agoUpdate default FATE URL for release/10
Reinhard Tartler [Fri, 7 Mar 2014 02:00:26 +0000 (21:00 -0500)]
Update default FATE URL for release/10

5 years agoRevert "Add libx265 encoder"
Reinhard Tartler [Fri, 7 Mar 2014 00:55:48 +0000 (19:55 -0500)]
Revert "Add libx265 encoder"

cf. the discussion following
https://lists.libav.org/pipermail/libav-devel/2014-March/056894.html

This reverts commit 50ea93158d4c480f64069e8bd1da388486dcf4ba.

Conflicts:
doc/general.texi
libavcodec/version.h

5 years agoconfigure: enable PIC on s390(x)
Reinhard Tartler [Sun, 2 Mar 2014 07:11:05 +0000 (02:11 -0500)]
configure: enable PIC on s390(x)

The s390 architecture requires shared libraries to be built in PIC mode.
Otherwise applications will get wrong relocations at run-time, leading
to confusing segmentation faults.

CC: libav-stable@libav.org
(cherry picked from commit 5ddc9f5052316608799b932c604f9e7561f8ce24)

5 years agoarm: hpeldsp: prevent overreads in armv6 asm
Janne Grunau [Wed, 5 Mar 2014 11:44:57 +0000 (12:44 +0100)]
arm: hpeldsp: prevent overreads in armv6 asm

Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>

Bug-Id: 646
CC: libav-stable@libav.org
5 years agoituh263: reject b-frame with pp_time = 0
Keiji Costantini [Sat, 1 Mar 2014 18:17:04 +0000 (18:17 +0000)]
ituh263: reject b-frame with pp_time = 0

Avoid a division by 0 in ff_mpeg4_set_one_direct_mv.

Sample-Id: 00000168-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
(cherry picked from commit 9514440337875e0c63b409abcd616b68c518283f)

5 years agoaf_compand: replace strtok_r() with av_get_token()
Anton Khirnov [Wed, 26 Feb 2014 21:37:06 +0000 (22:37 +0100)]
af_compand: replace strtok_r() with av_get_token()

(cherry picked from commit bc6461c2861b7d482a037d3b3e2b44ad48805fa0)

5 years agolatm: Always reconfigure if no extradata was set previously
Hendrik Leppkes [Thu, 22 Dec 2011 23:14:32 +0000 (00:14 +0100)]
latm: Always reconfigure if no extradata was set previously

AAC LOAS can have new audio config objects in the stream itself.

Make sure the decoder reconfigures itself when the first one arrives
midstream.

Bug-Id: 644
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 3aca10bf762a94d7de555cedf1ff0e4f6792bf41)

5 years agoaf_compand: add a dependency on strtok_r
Anton Khirnov [Wed, 26 Feb 2014 12:44:53 +0000 (13:44 +0100)]
af_compand: add a dependency on strtok_r

(cherry picked from commit 291e49d4e7db4b982621d7a25e258f898cfc3217)

5 years agolavfi: add compand audio filter
Andrew Kelley [Wed, 26 Feb 2014 06:47:40 +0000 (01:47 -0500)]
lavfi: add compand audio filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 738f83582a3aaabb81309eacd4ab9c3d2acb4071)

Conflicts:
libavfilter/version.h

5 years agoparser: cosmetics: Drop some unnecessary parentheses
Diego Biurrun [Tue, 25 Feb 2014 11:21:15 +0000 (12:21 +0100)]
parser: cosmetics: Drop some unnecessary parentheses

(cherry picked from commit 4ec336484d638b6b009636f465352c61a5a57061)

5 years agoparser: K&R formatting cosmetics
Luca Barbato [Sun, 23 Feb 2014 22:59:25 +0000 (23:59 +0100)]
parser: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit a1c699659d56b76c0bf399307f642c6fd6d28281)

5 years agoparser: Remove commented-out cruft
Diego Biurrun [Tue, 25 Feb 2014 10:59:05 +0000 (11:59 +0100)]
parser: Remove commented-out cruft

(cherry picked from commit ed61f3ca8a0664a697782253b354055136c5d303)

5 years agodoc: name correct header
Vittorio Giovara [Mon, 24 Feb 2014 15:59:40 +0000 (16:59 +0100)]
doc: name correct header

(cherry picked from commit 48d1ed9c83ee0c388e8c2898e81ffb4add509ab9)

5 years agoaf_volume: preserve frame properties
Anton Khirnov [Wed, 19 Feb 2014 19:55:27 +0000 (20:55 +0100)]
af_volume: preserve frame properties

(cherry picked from commit 39c2880eeae6930b1036ce1f479afc1e1152c13f)

5 years agoaf_resample: preserve frame properties
Anton Khirnov [Wed, 19 Feb 2014 19:42:39 +0000 (20:42 +0100)]
af_resample: preserve frame properties

(cherry picked from commit dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d)

5 years agoavconv: Do not divide by zero
Luca Barbato [Wed, 19 Feb 2014 20:41:12 +0000 (21:41 +0100)]
avconv: Do not divide by zero

(cherry picked from commit 5c79d2e12d13959fc6aed92d102c25194a06de05)

5 years agodca: replace some memcpy by AV_COPY128
Christophe Gisquet [Fri, 14 Feb 2014 15:03:10 +0000 (15:03 +0000)]
dca: replace some memcpy by AV_COPY128

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit ef010f08ae53479c54e2f16be5a7e1a809a9e268)

5 years agoh264: avoid undefined behavior in chroma motion compensation
Janne Grunau [Fri, 14 Feb 2014 16:00:06 +0000 (17:00 +0100)]
h264: avoid undefined behavior in chroma motion compensation

Makes fate-h264 pass under valgrind --undef-value-errors=yes with
-cpuflags none. {avg,put}_h264_chroma_mc8_8 approximately 5% faster,
{avg,put}_h264_chroma_mc4_8 2% faster both on x86 and arm.

(cherry picked from commit 982b596ea6640bfe218a31f6c3fc542d9fe61c31)

5 years agox86: dsputil: Use correct file name as multiple inclusion guard
Diego Biurrun [Mon, 23 Dec 2013 15:39:36 +0000 (16:39 +0100)]
x86: dsputil: Use correct file name as multiple inclusion guard

(cherry picked from commit 017a06a9ee86b047079166c2694c9c655ff03356)

5 years agobit_depth_template: Use file name as multiple inclusion guard
Diego Biurrun [Sun, 22 Dec 2013 13:19:28 +0000 (14:19 +0100)]
bit_depth_template: Use file name as multiple inclusion guard

(cherry picked from commit ba42c852477e87f6e47a5587e8f7829c46c52032)

5 years agosvq3: Adjust #endif comment
Diego Biurrun [Tue, 28 Jan 2014 07:23:02 +0000 (08:23 +0100)]
svq3: Adjust #endif comment

(cherry picked from commit 61e7c7f27b0a2652bf5cd282b97762ee99d025ef)

5 years agohevc: Mention the missing SPS in the error message
Luca Barbato [Tue, 18 Feb 2014 22:55:29 +0000 (23:55 +0100)]
hevc: Mention the missing SPS in the error message

(cherry picked from commit 175e5063320f585118a5461f15dbacf2ce17e97d)

5 years agodoc: Name the MOV muxer as it should be called
Luca Barbato [Tue, 18 Feb 2014 20:57:12 +0000 (21:57 +0100)]
doc: Name the MOV muxer as it should be called

The section name is the muxer, not the format.

(cherry picked from commit 93632a70f9ac2cb2ebf0e69d21fdfaae68ff02fd)

5 years agodoc: Sort the muxer documentation
Luca Barbato [Tue, 18 Feb 2014 16:12:30 +0000 (17:12 +0100)]
doc: Sort the muxer documentation

Keep the sections alphabetically sorted.

(cherry picked from commit a7b3216cbdc7796a9d14cd22a863fae3556098ba)

5 years agox86: dca: Add missing multiple inclusion guards
Diego Biurrun [Tue, 18 Feb 2014 13:30:04 +0000 (14:30 +0100)]
x86: dca: Add missing multiple inclusion guards

(cherry picked from commit b23bc95920e2f10b9621857e829c45b064f356c0)

5 years agogitignore: Add all examples below doc/examples
Diego Biurrun [Tue, 18 Feb 2014 17:37:48 +0000 (18:37 +0100)]
gitignore: Add all examples below doc/examples

(cherry picked from commit 294a51e18ab7df4d658249361a03f0d716a4e9f0)

5 years agoarm: Mark the stack as non-executable
Martin Storsjö [Fri, 7 Feb 2014 14:22:54 +0000 (16:22 +0200)]
arm: Mark the stack as non-executable

If linking in an object file without this attribute set, the
linker will assume that an executable stack might be needed.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 543156d7518f5e5d731123da066d86278f9fa492)

5 years agodoxygen: Replace @parblock syntax with manual linebreaks
Diego Biurrun [Sun, 16 Feb 2014 21:09:30 +0000 (22:09 +0100)]
doxygen: Replace @parblock syntax with manual linebreaks

@parblock is only supported in very recent Doxygen versions.

(cherry picked from commit 2f2b2efd31f6af997812a70de22b6d717fb41d4e)

5 years agodoxygen: Add a number of missing function parameter descriptions
Diego Biurrun [Sun, 16 Feb 2014 22:36:31 +0000 (23:36 +0100)]
doxygen: Add a number of missing function parameter descriptions

(cherry picked from commit 4d7ab5cfebef91820af2933ef2f622ea598e6b53)