ffmpeg.git
4 years agoMerge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'
Michael Niedermayer [Tue, 24 Feb 2015 22:44:20 +0000 (23:44 +0100)]
Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'

* commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74':
  rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78'
Michael Niedermayer [Tue, 24 Feb 2015 22:38:14 +0000 (23:38 +0100)]
Merge commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78'

* commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78':
  rtpdec: Add const to string parameters in internal fmtp parsing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '12251f997bbc0abb93be39c51021e6d404ca385f'
Michael Niedermayer [Tue, 24 Feb 2015 22:37:50 +0000 (23:37 +0100)]
Merge commit '12251f997bbc0abb93be39c51021e6d404ca385f'

* commit '12251f997bbc0abb93be39c51021e6d404ca385f':
  rtpdec: Remove unnecessary checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'
Michael Niedermayer [Tue, 24 Feb 2015 22:30:51 +0000 (23:30 +0100)]
Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'

* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
  rtpenc: Merge the h264 and hevc packetizers

Conflicts:
libavformat/rtpenc_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'
Michael Niedermayer [Tue, 24 Feb 2015 22:23:26 +0000 (23:23 +0100)]
Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'

* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
  rtpdec_hevc: Share the implementation of fragmented packets with h264

Conflicts:
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f3449062a8d100ac4f703647336c32b126aa99f1'
Michael Niedermayer [Tue, 24 Feb 2015 22:16:46 +0000 (23:16 +0100)]
Merge commit 'f3449062a8d100ac4f703647336c32b126aa99f1'

* commit 'f3449062a8d100ac4f703647336c32b126aa99f1':
  rtpdec_hevc: Reduce indentation level by returning early on errors

Conflicts:
libavformat/rtpdec_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'
Michael Niedermayer [Tue, 24 Feb 2015 22:03:12 +0000 (23:03 +0100)]
Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'

* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
  rtpdec_hevc: Share the implementation of parsing a=framesize with h264

Conflicts:
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684'
Michael Niedermayer [Tue, 24 Feb 2015 21:55:51 +0000 (22:55 +0100)]
Merge commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684'

* commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684':
  rtpdec_hevc: Add asterisks at the start of each long comment line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'
Michael Niedermayer [Tue, 24 Feb 2015 21:55:14 +0000 (22:55 +0100)]
Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'

* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8':
  rtpdec: Get rid of all trivial .alloc/.free functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd'
Michael Niedermayer [Tue, 24 Feb 2015 21:42:00 +0000 (22:42 +0100)]
Merge commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd'

* commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd':
  rtpdec: Allow allocating and freeing the private data without explicit functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'
Michael Niedermayer [Tue, 24 Feb 2015 21:34:04 +0000 (22:34 +0100)]
Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'

* commit '2b982e92f42a6e661d90b12b6592cd13cae496d4':
  rtpdec: Set need_parsing via a handler field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6'
Michael Niedermayer [Tue, 24 Feb 2015 21:33:45 +0000 (22:33 +0100)]
Merge commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6'

* commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6':
  rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885'
Michael Niedermayer [Tue, 24 Feb 2015 21:26:39 +0000 (22:26 +0100)]
Merge commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885'

* commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885':
  rtpdec_mpa_robust: Move .enc_name to the start of the struct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'db158f0dd217cf839be8af195d66cf49a76537a8'
Michael Niedermayer [Tue, 24 Feb 2015 21:26:15 +0000 (22:26 +0100)]
Merge commit 'db158f0dd217cf839be8af195d66cf49a76537a8'

* commit 'db158f0dd217cf839be8af195d66cf49a76537a8':
  rtpdec: Remove unnecessary _if_needed suffixes on functions

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202'
Michael Niedermayer [Tue, 24 Feb 2015 21:19:28 +0000 (22:19 +0100)]
Merge commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202'

* commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202':
  rtpdec: Change enc_name to a pointer instead of a fixed-size buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0752f700d63f6b15ffd5369ac7615414cce71247'
Michael Niedermayer [Tue, 24 Feb 2015 21:19:02 +0000 (22:19 +0100)]
Merge commit '0752f700d63f6b15ffd5369ac7615414cce71247'

* commit '0752f700d63f6b15ffd5369ac7615414cce71247':
  rtpdec_h264: Remove an unnecessary include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '247764a592f83521f9c1ccdc900b00a8b84f3c87'
Michael Niedermayer [Tue, 24 Feb 2015 21:12:13 +0000 (22:12 +0100)]
Merge commit '247764a592f83521f9c1ccdc900b00a8b84f3c87'

* commit '247764a592f83521f9c1ccdc900b00a8b84f3c87':
  rtpdec_h264: Remove unnecessary struct padding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'
Michael Niedermayer [Tue, 24 Feb 2015 21:11:54 +0000 (22:11 +0100)]
Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'

* commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b':
  rtpdec_amr: Use the common indentation style

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpdec: Don't pass non-const pointers to fmtp attribute parsing functions
Martin Storsjö [Tue, 24 Feb 2015 10:32:17 +0000 (12:32 +0200)]
rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

This makes it clear that the individual parsing functions can't
touch the parsed out value.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Add const to string parameters in internal fmtp parsing functions
Martin Storsjö [Tue, 24 Feb 2015 10:31:23 +0000 (12:31 +0200)]
rtpdec: Add const to string parameters in internal fmtp parsing functions

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Remove unnecessary checks
Martin Storsjö [Tue, 24 Feb 2015 11:30:12 +0000 (13:30 +0200)]
rtpdec: Remove unnecessary checks

The free function of a depacketizer won't be called if data is NULL.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c'
Michael Niedermayer [Tue, 24 Feb 2015 21:03:53 +0000 (22:03 +0100)]
Merge commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c'

* commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c':
  rtsp: Fix the indentation of a linewrapped statement

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3cd5828fc0007e6d056067444de053a34ddedd02'
Michael Niedermayer [Tue, 24 Feb 2015 21:03:14 +0000 (22:03 +0100)]
Merge commit '3cd5828fc0007e6d056067444de053a34ddedd02'

* commit '3cd5828fc0007e6d056067444de053a34ddedd02':
  rtpdec: Add missing trailing commas

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '04a1be8e28e81f3967eace7705343c450616cc95'
Michael Niedermayer [Tue, 24 Feb 2015 20:50:32 +0000 (21:50 +0100)]
Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'

* commit '04a1be8e28e81f3967eace7705343c450616cc95':
  libavformat: add T.140 RTP depacketization (RFC 4103)

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

See: af940e6cb1212d4338e55c03498ef5ae40e6e749
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '26524e358147aade6e9dd18fff42d61b966bbc70'
Michael Niedermayer [Tue, 24 Feb 2015 20:34:38 +0000 (21:34 +0100)]
Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'

* commit '26524e358147aade6e9dd18fff42d61b966bbc70':
  rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA

See: afb0e5a810ae110a69b618e5fbed78a7c1b899f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Only reinit quant tables if a new PPS is allowed
Michael Niedermayer [Tue, 24 Feb 2015 19:49:07 +0000 (20:49 +0100)]
avcodec/h264: Only reinit quant tables if a new PPS is allowed

Fixes null pointer dereference
Fixes: signal_sigsegv_3042097_3007_cov_1741463594_non_monotone_timestamps1.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters.texi: add reference link to video size syntax description
Tobias Rapp [Tue, 24 Feb 2015 12:23:56 +0000 (13:23 +0100)]
doc/filters.texi: add reference link to video size syntax description

Update the filter option documentation text to link to ffmpeg-utils
documentation for video size syntax description.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
4 years agoavformat/movenc: Fix writing ACLR atoms for DNxHD
Kevin Wheatley [Tue, 24 Feb 2015 10:00:07 +0000 (10:00 +0000)]
avformat/movenc: Fix writing ACLR atoms for DNxHD

Using the copy codec ACLR atoms where incorrectly written

During the creation of the ACLR atom we are assuming the vos_data
contains the DNxHD header. This change makes this explicit and
ensures we don't over write the stream with the extra_data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dss: Set packet position correctly
Michael Niedermayer [Tue, 24 Feb 2015 13:54:20 +0000 (14:54 +0100)]
avformat/dss: Set packet position correctly

pos previously was set but then overwritten

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpenc: Merge the h264 and hevc packetizers
Martin Storsjö [Mon, 23 Feb 2015 21:06:01 +0000 (23:06 +0200)]
rtpenc: Merge the h264 and hevc packetizers

They share a great deal of common structure; only a few minor
bits in the headers differ.

This also fixes an off-by-one in sending of the last fragment
of large HEVC nals (where it previously sent len+2 bytes, even
if it should have been len+RTP_HEVC_HEADERS_SIZE aka len+3).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_hevc: Share the implementation of fragmented packets with h264
Martin Storsjö [Mon, 23 Feb 2015 21:28:34 +0000 (23:28 +0200)]
rtpdec_hevc: Share the implementation of fragmented packets with h264

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_hevc: Reduce indentation level by returning early on errors
Martin Storsjö [Mon, 23 Feb 2015 21:17:54 +0000 (23:17 +0200)]
rtpdec_hevc: Reduce indentation level by returning early on errors

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_hevc: Share the implementation of parsing a=framesize with h264
Martin Storsjö [Mon, 23 Feb 2015 18:59:41 +0000 (20:59 +0200)]
rtpdec_hevc: Share the implementation of parsing a=framesize with h264

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_hevc: Add asterisks at the start of each long comment line
Martin Storsjö [Mon, 23 Feb 2015 21:13:55 +0000 (23:13 +0200)]
rtpdec_hevc: Add asterisks at the start of each long comment line

This is the common style for such comments.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Get rid of all trivial .alloc/.free functions
Martin Storsjö [Mon, 23 Feb 2015 20:18:32 +0000 (22:18 +0200)]
rtpdec: Get rid of all trivial .alloc/.free functions

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Allow allocating and freeing the private data without explicit functions
Martin Storsjö [Mon, 23 Feb 2015 19:57:33 +0000 (21:57 +0200)]
rtpdec: Allow allocating and freeing the private data without explicit functions

This can reduce the amount of boilerplate in simple depacketizers.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Set need_parsing via a handler field
Martin Storsjö [Mon, 23 Feb 2015 19:51:05 +0000 (21:51 +0200)]
rtpdec: Set need_parsing via a handler field

This avoids implementing a full function just to set this one
field.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler
Martin Storsjö [Mon, 23 Feb 2015 19:35:48 +0000 (21:35 +0200)]
rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler

This allows getting rid of quite a bit of boilerplate in depacketizers.

The default value (initializing need_parsing to 0, aka
AVSTREAM_PARSE_NONE) is the same as it is initialized to by default
in AVStream.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_mpa_robust: Move .enc_name to the start of the struct
Martin Storsjö [Mon, 23 Feb 2015 19:51:59 +0000 (21:51 +0200)]
rtpdec_mpa_robust: Move .enc_name to the start of the struct

This makes it match the other depacketizers.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Remove unnecessary _if_needed suffixes on functions
Martin Storsjö [Mon, 23 Feb 2015 20:25:55 +0000 (22:25 +0200)]
rtpdec: Remove unnecessary _if_needed suffixes on functions

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Change enc_name to a pointer instead of a fixed-size buffer
Martin Storsjö [Mon, 23 Feb 2015 19:53:19 +0000 (21:53 +0200)]
rtpdec: Change enc_name to a pointer instead of a fixed-size buffer

This avoids allocating space for a too large buffer for all the
name strings.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Remove an unnecessary include
Martin Storsjö [Mon, 23 Feb 2015 20:22:28 +0000 (22:22 +0200)]
rtpdec_h264: Remove an unnecessary include

Nothing in this file use any network functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_h264: Remove unnecessary struct padding
Martin Storsjö [Mon, 23 Feb 2015 20:03:44 +0000 (22:03 +0200)]
rtpdec_h264: Remove unnecessary struct padding

There's no point in adding padding in the allocation of a depacketizer
specific context struct.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec_amr: Use the common indentation style
Martin Storsjö [Mon, 23 Feb 2015 20:31:29 +0000 (22:31 +0200)]
rtpdec_amr: Use the common indentation style

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortsp: Fix the indentation of a linewrapped statement
Martin Storsjö [Mon, 23 Feb 2015 19:56:28 +0000 (21:56 +0200)]
rtsp: Fix the indentation of a linewrapped statement

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpdec: Add missing trailing commas
Martin Storsjö [Mon, 23 Feb 2015 20:06:41 +0000 (22:06 +0200)]
rtpdec: Add missing trailing commas

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibavformat: add T.140 RTP depacketization (RFC 4103)
Gilles Chanteperdrix [Sun, 8 Feb 2015 21:22:41 +0000 (22:22 +0100)]
libavformat: add T.140 RTP depacketization (RFC 4103)

Map this to AV_CODEC_ID_TEXT.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortsp: Interpret the text media type as AVMEDIA_TYPE_DATA
Martin Storsjö [Mon, 23 Feb 2015 15:16:32 +0000 (17:16 +0200)]
rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/mss4: check return value of init_get_bits8()
Paul B Mahol [Tue, 24 Feb 2015 13:17:34 +0000 (13:17 +0000)]
avcodec/mss4: check return value of init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavc/pthread_slice: release entries
Christophe Gisquet [Thu, 5 Feb 2015 15:00:11 +0000 (16:00 +0100)]
lavc/pthread_slice: release entries

When calling ff_alloc_entries, a number of entries are created.
They are never freed, as running fate with slice threading and
several frames on e.g. fate-hevc-conformance-ENTP_A_Qualcomm_1
would show.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutdec: fix isom and mpa build deps
Clément Bœsch [Tue, 24 Feb 2015 10:22:47 +0000 (11:22 +0100)]
avformat/nutdec: fix isom and mpa build deps

Fixes the following link error:
  nutdec.c:(.text+0x2d47): undefined reference to `ff_codec_movvideo_tags'
  isom.c:(.text+0x332): undefined reference to `avpriv_mpeg4audio_get_config'
  isom.c:(.text+0x39e): undefined reference to `avpriv_mpa_freq_tab'

4 years agoavcodec/snow: Free all planes and bands independent of the last count
Michael Niedermayer [Tue, 24 Feb 2015 02:21:12 +0000 (03:21 +0100)]
avcodec/snow: Free all planes and bands independent of the last count

Fixes memleak
Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowdec: Fix ref value check
Michael Niedermayer [Tue, 24 Feb 2015 02:12:22 +0000 (03:12 +0100)]
avcodec/snowdec: Fix ref value check

Fixes integer overflow and out of array read.
Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/utils: add asserts to check filterpos
Michael Niedermayer [Mon, 23 Feb 2015 23:35:11 +0000 (00:35 +0100)]
swscale/utils: add asserts to check filterpos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/utils: More carefully merge and clear coefficients outside the input
Michael Niedermayer [Mon, 23 Feb 2015 23:32:39 +0000 (00:32 +0100)]
swscale/utils: More carefully merge and clear coefficients outside the input

Fixes out of array read
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Check av_add_index_entry() return value
Michael Niedermayer [Mon, 23 Feb 2015 21:47:49 +0000 (22:47 +0100)]
avformat/mov: Check av_add_index_entry() return value

Fixes NULL pointer dereference
Fixes: signal_sigsegv_b060e0_3794_cov_1293954059_vc1-wmapro.ism

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoRevert "takdec: pad filter coeff buffer for DSP functions"
James Almer [Mon, 23 Feb 2015 21:22:37 +0000 (18:22 -0300)]
Revert "takdec: pad filter coeff buffer for DSP functions"

This reverts commit e0c7ba40cf0bb521430f4a808ed1f1a408093f9c.

Valgrind complains about invalid reads, which generate segfaults in some
systems.

4 years agoMerge commit 'ce52869c22738ad584995d48103ce3aa2301736b'
Michael Niedermayer [Mon, 23 Feb 2015 20:59:34 +0000 (21:59 +0100)]
Merge commit 'ce52869c22738ad584995d48103ce3aa2301736b'

* commit 'ce52869c22738ad584995d48103ce3aa2301736b':
  fate: Rename fate-dts test to fate-dca-core

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'
Michael Niedermayer [Mon, 23 Feb 2015 20:49:51 +0000 (21:49 +0100)]
Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'

* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
  qsv: Skip qsv.h compilation if qsv is not enabled

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'
Michael Niedermayer [Mon, 23 Feb 2015 20:39:29 +0000 (21:39 +0100)]
Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'

* commit 'cdcc370293a159c321e41af7f0eef141c62d698d':
  rtsp: punch holes again after pause

See: 22bb5bd7a3b55c25bfef130ad89e8574dd47af1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '061c489895d29049a88dc6118e4b639a273b31d6'
Michael Niedermayer [Mon, 23 Feb 2015 20:29:35 +0000 (21:29 +0100)]
Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'

* commit '061c489895d29049a88dc6118e4b639a273b31d6':
  eamad: check for out of bounds read

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf'
Michael Niedermayer [Mon, 23 Feb 2015 20:12:26 +0000 (21:12 +0100)]
Merge commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf'

* commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf':
  mdec: check for out of bounds read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'
Michael Niedermayer [Mon, 23 Feb 2015 20:01:44 +0000 (21:01 +0100)]
Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'

* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
  rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Conflicts:
libavformat/rtpdec_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: Allocate and reference coded_frame correctly
Michael Niedermayer [Mon, 23 Feb 2015 18:09:44 +0000 (19:09 +0100)]
avcodec/snowenc: Allocate and reference coded_frame correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: Allocate and reference coded_frame correctly
Michael Niedermayer [Mon, 23 Feb 2015 18:05:56 +0000 (19:05 +0100)]
avcodec/roqvideoenc: Allocate and reference coded_frame correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsenc: Warn if a non file protocol is used
Michael Niedermayer [Sat, 21 Feb 2015 18:27:06 +0000 (19:27 +0100)]
avformat/hlsenc: Warn if a non file protocol is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: Rename fate-dts test to fate-dca-core
Diego Biurrun [Wed, 18 Feb 2015 23:04:33 +0000 (00:04 +0100)]
fate: Rename fate-dts test to fate-dca-core

The codec is referred to as DCA in other parts of libav.

4 years agoqsv: Skip qsv.h compilation if qsv is not enabled
Diego Biurrun [Mon, 23 Feb 2015 12:43:53 +0000 (13:43 +0100)]
qsv: Skip qsv.h compilation if qsv is not enabled

4 years agoavcodec/hqx: remove superfluous log message
Paul B Mahol [Mon, 23 Feb 2015 14:57:48 +0000 (14:57 +0000)]
avcodec/hqx: remove superfluous log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agortsp: punch holes again after pause
Gilles Chanteperdrix [Sun, 22 Feb 2015 06:59:55 +0000 (07:59 +0100)]
rtsp: punch holes again after pause

When a client behind a NAT issues a pause command, and stay paused for a
long time, the router may stop the RTP/RTCP port redirection. Resend the
hole punching packets before each PLAY command to cause the router to
restart the port redirection in that case.

Move the existing code for sending the packets from the SETUP phase
to the PLAY phase.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoeamad: check for out of bounds read
Federico Tomassetti [Wed, 18 Feb 2015 12:11:44 +0000 (12:11 +0000)]
eamad: check for out of bounds read

Bug-Id: CID 1257500
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agomdec: check for out of bounds read
Federico Tomassetti [Wed, 18 Feb 2015 12:11:43 +0000 (12:11 +0000)]
mdec: check for out of bounds read

Bug-Id: CID 1257501
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agortpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units
Martin Storsjö [Sun, 22 Feb 2015 21:25:28 +0000 (23:25 +0200)]
rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Only the first aggregation unit has 2 bytes (DONL) prepended, if
such a field is in use.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavfilter/palette{gen,use}: add Copyright
Clément Bœsch [Mon, 23 Feb 2015 13:00:13 +0000 (14:00 +0100)]
avfilter/palette{gen,use}: add Copyright

4 years agoMerge commit '35c6ce76b107225a19eb33aea38857d2405882af'
Michael Niedermayer [Mon, 23 Feb 2015 11:03:29 +0000 (12:03 +0100)]
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '36a6fb989b017898041703025ef20028146675a8'
Michael Niedermayer [Mon, 23 Feb 2015 10:52:43 +0000 (11:52 +0100)]
Merge commit '36a6fb989b017898041703025ef20028146675a8'

* commit '36a6fb989b017898041703025ef20028146675a8':
  hevc_deblock: Fix compilation with nasm

See: c75fdee747179e21e3cc137b2565ba911b17f9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'
Michael Niedermayer [Mon, 23 Feb 2015 10:42:16 +0000 (11:42 +0100)]
Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'

* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
libavcodec/libschroedinger.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'
Michael Niedermayer [Mon, 23 Feb 2015 10:23:30 +0000 (11:23 +0100)]
Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'

* commit '521979e6b1e7a89751aebc285a40d6508f8af48f':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
configure

See: f514b5dff769a331ea2153c23594d9b29b667141
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'
Michael Niedermayer [Mon, 23 Feb 2015 10:10:25 +0000 (11:10 +0100)]
Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'

* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7':
  configure: Use pkg-config for libdc1394 discovery

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/paletteuse: add diff_mode
Clément Bœsch [Mon, 16 Feb 2015 16:40:55 +0000 (17:40 +0100)]
avfilter/paletteuse: add diff_mode

4 years agoavfilter/paletteuse: fix error dithering accuracy
Clément Bœsch [Wed, 18 Feb 2015 10:17:10 +0000 (11:17 +0100)]
avfilter/paletteuse: fix error dithering accuracy

4 years agoavcodec/a64multienc: Assert that the Packet size does not grow
Michael Niedermayer [Mon, 23 Feb 2015 00:58:11 +0000 (01:58 +0100)]
avcodec/a64multienc: Assert that the Packet size does not grow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/a64multienc: simplify frame handling code
Michael Niedermayer [Sun, 22 Feb 2015 23:55:13 +0000 (00:55 +0100)]
avcodec/a64multienc: simplify frame handling code

This also fixes a memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/a64multienc: fix use of uninitialized values in to_meta_with_crop
Andreas Cadhalpun [Sun, 22 Feb 2015 19:48:38 +0000 (20:48 +0100)]
avcodec/a64multienc: fix use of uninitialized values in to_meta_with_crop

Averaging over 2 pixels doesn't work correctly for the last pixel, because the
rest of the buffer is not initialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/a64multienc: initialize mc_meta_charset to zero
Andreas Cadhalpun [Sun, 22 Feb 2015 19:47:50 +0000 (20:47 +0100)]
avcodec/a64multienc: initialize mc_meta_charset to zero

This fixes the use of uninitialized values in avpriv_do_elbg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/a64multienc: don't set incorrect packet size
Michael Niedermayer [Mon, 23 Feb 2015 00:21:30 +0000 (01:21 +0100)]
avcodec/a64multienc: don't set incorrect packet size

This fixes invalid reads of the packet buffer in av_dup_packet

Based on patch by Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/a64multienc: use av_frame_ref instead of copying the frame
Andreas Cadhalpun [Sun, 22 Feb 2015 19:43:30 +0000 (20:43 +0100)]
avcodec/a64multienc: use av_frame_ref instead of copying the frame

This fixes freeing the frame buffer twice on cleanup leading to a crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a388e72d1a6b0888cc1591cb699f61a9c1089cf4'
Michael Niedermayer [Sun, 22 Feb 2015 23:29:45 +0000 (00:29 +0100)]
Merge commit 'a388e72d1a6b0888cc1591cb699f61a9c1089cf4'

* commit 'a388e72d1a6b0888cc1591cb699f61a9c1089cf4':
  rtpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159'
Michael Niedermayer [Sun, 22 Feb 2015 23:13:19 +0000 (00:13 +0100)]
Merge commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159'

* commit 'e2220e734f3d01145ef9aefbd7b6ff29a89ae159':
  rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'
Michael Niedermayer [Sun, 22 Feb 2015 22:54:11 +0000 (23:54 +0100)]
Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'

* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7':
  rtpdec: DV depacketizer (RFC 6469)

Conflicts:
Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h

See: cbe508553ad17b277d4cb6f12f61aac4f52908b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoCanopus HQX decoder
Vittorio Giovara [Sun, 22 Feb 2015 18:38:31 +0000 (18:38 +0000)]
Canopus HQX decoder

Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.

4 years agohevc_deblock: Fix compilation with nasm
Carl Eugen Hoyos [Sun, 22 Feb 2015 17:46:49 +0000 (17:46 +0000)]
hevc_deblock: Fix compilation with nasm

CC: libav-stable@libav.org
Bug-Id: 795
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agolibschroedinger: Check memory allocations
Vittorio Giovara [Sun, 22 Feb 2015 19:49:06 +0000 (19:49 +0000)]
libschroedinger: Check memory allocations

4 years agoconfigure: Properly fail when libcdio/cdparanoia is not found
Vittorio Giovara [Sun, 22 Feb 2015 19:49:52 +0000 (19:49 +0000)]
configure: Properly fail when libcdio/cdparanoia is not found

4 years agoconfigure: Use pkg-config for libdc1394 discovery
Vittorio Giovara [Sun, 22 Feb 2015 20:33:24 +0000 (20:33 +0000)]
configure: Use pkg-config for libdc1394 discovery

Since not all systems need the libraw1394 dependency, let pkg-config
provide the list of libraries actually needed.

The libdc1394-2.pc file has been included since version 2 (2008-01-05),
so it should be safe to use.

4 years agotools/graph2dot: Check for av_malloc() failure
Michael Niedermayer [Sun, 22 Feb 2015 21:43:06 +0000 (22:43 +0100)]
tools/graph2dot: Check for av_malloc() failure

Fixes CID1271047

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/aacenc: Fix sample rate check
Michael Niedermayer [Sun, 22 Feb 2015 21:25:27 +0000 (22:25 +0100)]
avcodec/aacenc: Fix sample rate check

Fixes out of array read
Fixes CID1257803, CID1257797, CID1257789, CID1257786

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible
Martin Storsjö [Fri, 20 Feb 2015 19:37:50 +0000 (21:37 +0200)]
rtpenc_hevc: Aggregate multiple NAL units into one RTP packet, if possible

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible
Martin Storsjö [Fri, 20 Feb 2015 19:21:27 +0000 (21:21 +0200)]
rtpenc_h264: Aggregate multiple NAL units into one RTP packet, if possible

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/mpegvideo: Fix memleak of mvs
Michael Niedermayer [Sun, 22 Feb 2015 21:18:26 +0000 (22:18 +0100)]
avcodec/mpegvideo: Fix memleak of mvs

Fixes CID1271053

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