ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 23 Sep 2013 12:47:01 +0000 (14:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenchint: Clear size and len if the realloc failed

Conflicts:
libavformat/movenchint.c

See: 63621762eccf4c825ef1d42251b0d45d0c498826
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'
Michael Niedermayer [Mon, 23 Sep 2013 12:40:06 +0000 (14:40 +0200)]
Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'

* commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494':
  movenc: Return a proper error code for invalid combinations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'
Michael Niedermayer [Mon, 23 Sep 2013 12:34:18 +0000 (14:34 +0200)]
Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'

* commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9':
  vc1dec: Check the error handling flags on slice/field header decode errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f7e616959aff8706edccdae763c24c897c449f6f'
Michael Niedermayer [Mon, 23 Sep 2013 12:27:09 +0000 (14:27 +0200)]
Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'

* commit 'f7e616959aff8706edccdae763c24c897c449f6f':
  electronicarts: Check packet sizes before reading

Conflicts:
libavformat/electronicarts.c

See: fb1ea777b3a01be6d71a103529ad37982707cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
Michael Niedermayer [Mon, 23 Sep 2013 12:13:43 +0000 (14:13 +0200)]
Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'

* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
  lavf: Avoid setting avg_frame_rate if delta_dts is negative

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: fix uninitialized variable warning
Stefano Sabatini [Mon, 23 Sep 2013 12:10:52 +0000 (14:10 +0200)]
ffprobe: fix uninitialized variable warning

Fix warning:
ffprobe.c:1684:21: warning: ‘start’ may be used uninitialized in this function [-Wmaybe-uninitialized] end = start + interval->end;

The warning is a false positive, since the variable is accessed only if
has_start is set, and in that case start has been already set.

6 years agoMerge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'
Michael Niedermayer [Mon, 23 Sep 2013 12:03:53 +0000 (14:03 +0200)]
Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'

* commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd':
  vc1dec: Don't decode slices when the latest slice header failed to decode

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64'
Michael Niedermayer [Mon, 23 Sep 2013 11:52:40 +0000 (13:52 +0200)]
Merge commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64'

* commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64':
  vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks

See: 09de0ffeab37442d1a31ee194ea6d78a67186de1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'
Michael Niedermayer [Mon, 23 Sep 2013 11:41:26 +0000 (13:41 +0200)]
Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'

* commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a':
  vc1dec: Undo mpegvideo initialization if unable to allocate tables

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'
Michael Niedermayer [Mon, 23 Sep 2013 11:29:29 +0000 (13:29 +0200)]
Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'

* commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3':
  vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'
Michael Niedermayer [Mon, 23 Sep 2013 11:20:42 +0000 (13:20 +0200)]
Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'

* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8':
  wnv1: Make sure the input packet is large enough

Conflicts:
libavcodec/wnv1.c

See: f23a2418fb0ccc56fdae4dbf83a5994cc917c475
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f1eac2b8a0370b908cd691086d11f51342054730'
Michael Niedermayer [Mon, 23 Sep 2013 10:33:08 +0000 (12:33 +0200)]
Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'

* commit 'f1eac2b8a0370b908cd691086d11f51342054730':
  movenc: Use keyframes as default fragmentation point in ismv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'
Michael Niedermayer [Mon, 23 Sep 2013 10:22:03 +0000 (12:22 +0200)]
Merge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'

* commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd':
  movenc: Set all implicit flags immediately in mov_write_header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'
Michael Niedermayer [Mon, 23 Sep 2013 10:17:10 +0000 (12:17 +0200)]
Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'

* commit '187023f6b2b43966acb2449a379b4ededdc4b22e':
  movenc: Set mov->mode earlier in mov_write_header

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3'
Michael Niedermayer [Mon, 23 Sep 2013 10:01:49 +0000 (12:01 +0200)]
Merge commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3'

* commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3':
  tls: Do not abort on non-fatal TLS alerts with gnutls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c951e4b442df9dde6051634a85359eb809bf2142'
Michael Niedermayer [Mon, 23 Sep 2013 09:56:24 +0000 (11:56 +0200)]
Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'

* commit 'c951e4b442df9dde6051634a85359eb809bf2142':
  flv: Make onTextData parsing robust

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'
Michael Niedermayer [Mon, 23 Sep 2013 09:45:11 +0000 (11:45 +0200)]
Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'

* commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6':
  rtmp: Replace a magic number with a macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'
Michael Niedermayer [Mon, 23 Sep 2013 09:40:10 +0000 (11:40 +0200)]
Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'

* commit '5840473890440dbe0bd2cce530ebb3d93e187ae6':
  rtmp: Rewrite embedded flv handling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'
Michael Niedermayer [Mon, 23 Sep 2013 09:36:02 +0000 (11:36 +0200)]
Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'

* commit 'e40a0e822801d2485e4e555909d7a82713fa86a5':
  rtmp: Refactor get_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'
Michael Niedermayer [Mon, 23 Sep 2013 09:31:09 +0000 (11:31 +0200)]
Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'

* commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2':
  rtmp: Support AMF_DATA_TYPE_MIXEDARRAY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibopenjpeg: init and close properly; don't config during encode
Michael Bradshaw [Tue, 17 Sep 2013 00:54:36 +0000 (18:54 -0600)]
libopenjpeg: init and close properly; don't config during encode

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/escape124: fix infinite loop
Paul B Mahol [Sun, 22 Sep 2013 23:42:33 +0000 (23:42 +0000)]
avcodec/escape124: fix infinite loop

Remove can_safely_read() as its not really needed with
checked bitstream reader.

Fixes #2984.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodoc/filters: add [] labels for the graph of the opening paragraph example
Timothy Gu [Sat, 21 Sep 2013 22:39:35 +0000 (15:39 -0700)]
doc/filters: add [] labels for the graph of the opening paragraph example

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc/filters: use between() function in select examples
Stefano Sabatini [Sat, 21 Sep 2013 18:36:12 +0000 (20:36 +0200)]
doc/filters: use between() function in select examples

Simplify.

6 years agodoc/fftools: rework some paragraph in the AVOptions chapter
Stefano Sabatini [Sat, 21 Sep 2013 08:19:21 +0000 (10:19 +0200)]
doc/fftools: rework some paragraph in the AVOptions chapter

Fix typos, and clarify note about codec AVOptions.

6 years agodoc/filters: put ladspa configure option into @code{}
Paul B Mahol [Sun, 22 Sep 2013 20:39:16 +0000 (20:39 +0000)]
doc/filters: put ladspa configure option into @code{}

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotests/fate/prores: fix skip alpha tests on big endian
Michael Niedermayer [Sun, 22 Sep 2013 18:44:54 +0000 (20:44 +0200)]
tests/fate/prores: fix skip alpha tests on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ABI issues)
Michael Niedermayer [Sun, 22 Sep 2013 18:36:21 +0000 (20:36 +0200)]
avcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ABI issues)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: mention configure option for ladspa
Paul B Mahol [Sun, 22 Sep 2013 18:45:50 +0000 (18:45 +0000)]
doc/filters: mention configure option for ladspa

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomovenchint: Clear size and len if the realloc failed
Martin Storsjö [Sun, 22 Sep 2013 15:31:54 +0000 (18:31 +0300)]
movenchint: Clear size and len if the realloc failed

Previously these were left in an inconsistent state.

Pointed out by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Return a proper error code for invalid combinations
Martin Storsjö [Sun, 22 Sep 2013 11:44:17 +0000 (14:44 +0300)]
movenc: Return a proper error code for invalid combinations

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Check the error handling flags on slice/field header decode errors
Martin Storsjö [Sun, 22 Sep 2013 11:50:48 +0000 (14:50 +0300)]
vc1dec: Check the error handling flags on slice/field header decode errors

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoelectronicarts: Check packet sizes before reading
Martin Storsjö [Fri, 20 Sep 2013 09:26:45 +0000 (12:26 +0300)]
electronicarts: Check packet sizes before reading

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavf: Avoid setting avg_frame_rate if delta_dts is negative
Martin Storsjö [Fri, 20 Sep 2013 09:20:06 +0000 (12:20 +0300)]
lavf: Avoid setting avg_frame_rate if delta_dts is negative

This avoids setting avg_frame_rate to invalid (negative)
values.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Don't decode slices when the latest slice header failed to decode
Michael Niedermayer [Tue, 19 Feb 2013 20:40:09 +0000 (21:40 +0100)]
vc1dec: Don't decode slices when the latest slice header failed to decode

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
Martin Storsjö [Fri, 20 Sep 2013 08:32:25 +0000 (11:32 +0300)]
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovc1dec: Undo mpegvideo initialization if unable to allocate tables
Martin Storsjö [Fri, 20 Sep 2013 08:16:57 +0000 (11:16 +0300)]
vc1dec: Undo mpegvideo initialization if unable to allocate tables

Previously, s->context_initialized was left set to 1
if ff_vc1_decode_init_alloc_tables failed, skipping the
initialization completely on the next decode call.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is...
Kieran Kunhya [Sun, 22 Sep 2013 15:54:47 +0000 (10:54 -0500)]
lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/sgirledec: fix infinite loop in decode_sgirle8()
Paul B Mahol [Sun, 22 Sep 2013 17:22:51 +0000 (17:22 +0000)]
avcodec/sgirledec: fix infinite loop in decode_sgirle8()

Fixes #2985.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter: add ladspa wrapper filter
Paul B Mahol [Fri, 20 Sep 2013 14:01:00 +0000 (14:01 +0000)]
avfilter: add ladspa wrapper filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMake decoding alpha optional for some codecs.
Reimar Döffinger [Thu, 8 Aug 2013 18:27:24 +0000 (20:27 +0200)]
Make decoding alpha optional for some codecs.

For codecs where decoding of a whole plane can simply
be skipped, we should offer applications to not decode
alpha for better performance (ca. 30% less CPU usage
and 40% reduced memory bandwidth).
It also means applications do not need to implement support
(even if it is rather simple) for YUVA formats in order to be
able to play these files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoavformat/mov: reset extradata size when extradata gets deallocated due to realloc...
Michael Niedermayer [Sun, 22 Sep 2013 13:58:13 +0000 (15:58 +0200)]
avformat/mov: reset extradata size when extradata gets deallocated due to realloc failure

This prevents the fields from becoming inconsistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix nonsense MPEG-4 hwaccel code.
Reimar Döffinger [Wed, 21 Aug 2013 03:04:46 +0000 (05:04 +0200)]
Fix nonsense MPEG-4 hwaccel code.

Issues with the code:
1) The skip_bits_long breaks packed B-frames since we skip
of the packed frame, even for VDPAU.
2) Calling ff_h263_find_resync_marker_reverse is nonsense for MPEG-4,
and for H.263 the only code using this (vaapi_mpeg4) explicitly reverts
this change!
3) mb_x/mb_y are always 0 when vaapi_mpeg4_decode_slice, so doing
computations with them is just obfuscation
4) due to not updating mb_y the code would always go into the error
resilience case, causing nonsense error messages and maybe further
issues.

While tested to fix the data provided to the decoder in case of
VDPAU so it is the same as for the non-hwaccel code, the VA-API code
was not tested to still work, and adding regression testing even
as a quick hack is much more complicated for it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agovc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
Martin Storsjö [Fri, 20 Sep 2013 08:16:00 +0000 (11:16 +0300)]
vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agownv1: Make sure the input packet is large enough
Martin Storsjö [Thu, 19 Sep 2013 21:07:34 +0000 (00:07 +0300)]
wnv1: Make sure the input packet is large enough

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Use keyframes as default fragmentation point in ismv
Martin Storsjö [Tue, 10 Sep 2013 15:43:19 +0000 (18:43 +0300)]
movenc: Use keyframes as default fragmentation point in ismv

Fragmenting blindly to a certain duration isn't a good choice
if one should be able to switch between different qualities,
therefore default to keyframes instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Set all implicit flags immediately in mov_write_header
Martin Storsjö [Tue, 10 Sep 2013 12:56:19 +0000 (15:56 +0300)]
movenc: Set all implicit flags immediately in mov_write_header

This makes sure other sanity checks for conflicting options
can work properly, e.g. for the conflict between the faststart
flag when using the ismv mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Set mov->mode earlier in mov_write_header
Martin Storsjö [Sat, 21 Sep 2013 22:29:33 +0000 (01:29 +0300)]
movenc: Set mov->mode earlier in mov_write_header

This allows simplifying some early checks that depend on the
muxer mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agotls: Do not abort on non-fatal TLS alerts with gnutls
Martin Storsjö [Sat, 21 Sep 2013 22:02:36 +0000 (01:02 +0300)]
tls: Do not abort on non-fatal TLS alerts with gnutls

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavformat/movenchint: use realloc_array() to protect against integer overflow
Michael Niedermayer [Sun, 22 Sep 2013 13:06:22 +0000 (15:06 +0200)]
avformat/movenchint: use realloc_array() to protect against integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/movenchint: only change queue size if reallocation succeeded
Michael Niedermayer [Sun, 22 Sep 2013 13:05:35 +0000 (15:05 +0200)]
avformat/movenchint: only change queue size if reallocation succeeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/movenchint: revert "Use av_reallocp() where suitable"
Michael Niedermayer [Sun, 22 Sep 2013 12:59:25 +0000 (14:59 +0200)]
avformat/movenchint: revert "Use av_reallocp() where suitable"

reverts movenchin part of 5626f994f273af80fb100d4743b963304de9e05c
The change left the fields in an inconsistent state

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Sep 2013 09:51:18 +0000 (11:51 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Fix compilation with inline asm disabled on mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'
Michael Niedermayer [Sun, 22 Sep 2013 09:37:09 +0000 (11:37 +0200)]
Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
  lavu: Add interleaved 4:2:2 8/10-bit formats

Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

See: 90ca5a9b5fc3f1484c389a44f40ee1af4b8f435e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/pixdesc: try to fix NV20* descriptors
Michael Niedermayer [Sun, 22 Sep 2013 09:32:59 +0000 (11:32 +0200)]
avutil/pixdesc: try to fix NV20* descriptors

They where inconsistent (overlapping fields and wrong sizes)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd interleaved 4:2:2 8/10-bit formats
Kieran Kunhya [Tue, 17 Sep 2013 21:30:48 +0000 (16:30 -0500)]
Add interleaved 4:2:2 8/10-bit formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflv: Make onTextData parsing robust
Luca Barbato [Fri, 20 Sep 2013 21:14:41 +0000 (23:14 +0200)]
flv: Make onTextData parsing robust

Certain streaming servers do not preserve the order of the fields.

6 years agortmp: Replace a magic number with a macro
Luca Barbato [Sat, 21 Sep 2013 19:16:04 +0000 (21:16 +0200)]
rtmp: Replace a magic number with a macro

11 is the RTMP header size.

6 years agortmp: Rewrite embedded flv handling
Luca Barbato [Sat, 21 Sep 2013 09:10:41 +0000 (11:10 +0200)]
rtmp: Rewrite embedded flv handling

Use update_offset() as done for rtmp audio, video and notifications and
read update and write the fields instead of replacing them in the rtmp
packet and then memcpying it to the output buffer.

6 years agortmp: Refactor get_packet
Luca Barbato [Sat, 21 Sep 2013 09:09:39 +0000 (11:09 +0200)]
rtmp: Refactor get_packet

6 years agortmp: Support AMF_DATA_TYPE_MIXEDARRAY
Luca Barbato [Sat, 21 Sep 2013 08:04:54 +0000 (10:04 +0200)]
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY

And fix the AMF_DATA_TYPE_ARRAY parsing while at it.

A MIXEDARRAY type, as the ARRAY, store the number of elements in
an uint32 before the list. The ARRAY is strict and does not have
an OBJECT terminator, MIXEDARRAY behaves like an OBJECT type and
a different than stated number of element can be present.

6 years agoavcodec/g2meet: Fix framebuf size
Michael Niedermayer [Sat, 21 Sep 2013 21:34:11 +0000 (23:34 +0200)]
avcodec/g2meet: Fix framebuf size

Currently the code can in some cases draw tiles that hang outside the
allocated buffer. This patch increases the buffer size to avoid out
of array accesses. An alternative would be to fail if such tiles are
encountered.
I do not know if any valid files use such hanging tiles.

Fixes Ticket2971
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agochangelog: add fraps and libx264 changes
Compn [Sat, 21 Sep 2013 21:57:08 +0000 (17:57 -0400)]
changelog: add fraps and libx264 changes

6 years agoavutil: Fix compilation with inline asm disabled on mingw
Alex Smith [Sat, 21 Sep 2013 11:22:12 +0000 (07:22 -0400)]
avutil: Fix compilation with inline asm disabled on mingw

Because of -Werror=implicit-function-declaration the build will fail.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavformat/hls: do not limit manifest lines to 1024 chars
Michael Niedermayer [Sat, 21 Sep 2013 18:59:30 +0000 (20:59 +0200)]
avformat/hls: do not limit manifest lines to 1024 chars

Fixes Ticket2976
Debuged-by: jaimeMF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: Add interleaved 4:2:2 8/10-bit formats
Kieran Kunhya [Tue, 17 Sep 2013 21:30:48 +0000 (16:30 -0500)]
lavu: Add interleaved 4:2:2 8/10-bit formats

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavcodec: fix duplicate includes
Michael Niedermayer [Sat, 21 Sep 2013 14:59:13 +0000 (16:59 +0200)]
avcodec: fix duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/network: fix duplicate include
Michael Niedermayer [Sat, 21 Sep 2013 14:58:58 +0000 (16:58 +0200)]
avformat/network: fix duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/libssh: add MAINTAINERS entry
Lukasz Marek [Sat, 21 Sep 2013 14:30:46 +0000 (16:30 +0200)]
lavf/libssh: add MAINTAINERS entry

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/attributes: Don't define av_restrict
Alex Smith [Sat, 21 Sep 2013 13:22:55 +0000 (09:22 -0400)]
lavu/attributes: Don't define av_restrict

This is always defined in config.h.

Original patch by Derek Buitenhuis.

6 years agoavformat: remove duplicate includes
Michael Niedermayer [Sat, 21 Sep 2013 13:11:12 +0000 (15:11 +0200)]
avformat: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/v4l: remove duplicate include
Michael Niedermayer [Sat, 21 Sep 2013 13:04:04 +0000 (15:04 +0200)]
avdevice/v4l: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: remove duplicate includes
Michael Niedermayer [Sat, 21 Sep 2013 13:02:34 +0000 (15:02 +0200)]
avfilter: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/cpu: remove duplicate include
Michael Niedermayer [Sat, 21 Sep 2013 12:55:57 +0000 (14:55 +0200)]
avutil/cpu: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/fraps: use BT.709 colorspace for YUV Fraps versions
Hendrik Leppkes [Tue, 17 Sep 2013 18:26:43 +0000 (18:26 +0000)]
avcodec/fraps: use BT.709 colorspace for YUV Fraps versions

Based both on comparison to the reference decoder, and comments from
the fraps developers upon inquiry how to handle the yuv fraps variants.

6 years agolavfi/pad,crop,scale: remove options description from filter description
Paul B Mahol [Thu, 19 Sep 2013 17:39:08 +0000 (17:39 +0000)]
lavfi/pad,crop,scale: remove options description from filter description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p
Paul B Mahol [Fri, 20 Sep 2013 10:35:01 +0000 (10:35 +0000)]
avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotools: Fix apparent merge failure
Alex Smith [Sat, 21 Sep 2013 12:32:24 +0000 (08:32 -0400)]
tools: Fix apparent merge failure

6 years agomatroska: Add the CueDuration element
James Almer [Sat, 21 Sep 2013 01:15:49 +0000 (22:15 -0300)]
matroska: Add the CueDuration element

Use it only on subtitle CuePoints.
With proper demuxer/splitter support this should improve the display
of subtitles right after seeking to a given point in the stream.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 21 Sep 2013 12:07:36 +0000 (14:07 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow encoding YUVJ422P and YUVJ444P with libx264.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRemove '-vf' from pullup documentation example.
Carl Eugen Hoyos [Sat, 21 Sep 2013 10:17:20 +0000 (12:17 +0200)]
Remove '-vf' from pullup documentation example.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 Sep 2013 09:57:06 +0000 (11:57 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264dec: Add .avc file name extension

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'
Michael Niedermayer [Sat, 21 Sep 2013 09:09:38 +0000 (11:09 +0200)]
Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'

* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
  h264dec: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAllow encoding YUVJ422P and YUVJ444P with libx264.
Carl Eugen Hoyos [Sat, 21 Sep 2013 07:52:47 +0000 (09:52 +0200)]
Allow encoding YUVJ422P and YUVJ444P with libx264.

Reviewed-by: Reimar
6 years agompeg4dec: Ensure data is not clobbered too early.
Reimar Döffinger [Wed, 18 Sep 2013 23:08:30 +0000 (01:08 +0200)]
mpeg4dec: Ensure data is not clobbered too early.

Avoid overwriting the bitstream buffer data before we
have ended processing the frame.
This is necessary to fix hwaccels which might try to use
the buffer during the end_frame call.
I am not sure but it is possible this could even trigger
a use-after-free if the av_fast_malloc allocated a new buffer.
This would require that decode_slice did not wind the bitstream
forward all the way to the end, which does not currently happen in
normal streams.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoMerge commit '67e285ceca1cb602a5ab87010b30d904527924fe'
Michael Niedermayer [Sat, 21 Sep 2013 07:31:29 +0000 (09:31 +0200)]
Merge commit '67e285ceca1cb602a5ab87010b30d904527924fe'

* commit '67e285ceca1cb602a5ab87010b30d904527924fe':
  mem: Handle av_reallocp(..., 0) properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add adelay test
Paul B Mahol [Thu, 19 Sep 2013 17:32:09 +0000 (17:32 +0000)]
fate: add adelay test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodvbsubdec: Check for invalid clut selector.
Reimar Döffinger [Wed, 18 Sep 2013 17:55:40 +0000 (19:55 +0200)]
dvbsubdec: Check for invalid clut selector.

Fail decoding if strict compliance is requested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoApply clut changes only to one table.
JULIAN GARDNER [Wed, 4 Sep 2013 21:51:34 +0000 (22:51 +0100)]
Apply clut changes only to one table.

The specification does not allow multiple bits to be set,
but some encoders do it anyway.
Applying it only to the first seems to give better results.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agolavf: add SFTP protocol via libssh
Lukasz Marek [Wed, 18 Sep 2013 12:08:11 +0000 (14:08 +0200)]
lavf: add SFTP protocol via libssh

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoImprove pullup documentation.
Carl Eugen Hoyos [Sat, 21 Sep 2013 00:06:19 +0000 (02:06 +0200)]
Improve pullup documentation.

Mention that the fps filter should be used after pullup.

6 years agoavfilter/vf_psnr: avoid 64bit arithmetic in the inner loop
Michael Niedermayer [Sat, 21 Sep 2013 01:02:20 +0000 (03:02 +0200)]
avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_psnr: Prevent integer overflow.
Neil Birkbeck [Sat, 21 Sep 2013 00:25:40 +0000 (17:25 -0700)]
avfilter/vf_psnr: Prevent integer overflow.

The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: remove unused variable
Michael Niedermayer [Fri, 20 Sep 2013 20:50:41 +0000 (22:50 +0200)]
avformat/utils: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avienc: remove unused variable
Michael Niedermayer [Fri, 20 Sep 2013 20:50:06 +0000 (22:50 +0200)]
avformat/avienc: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: Add CuePoints for subtitle tracks
James Almer [Sat, 14 Sep 2013 08:59:21 +0000 (05:59 -0300)]
matroskaenc: Add CuePoints for subtitle tracks

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264dec: Add .avc file name extension
Vittorio Giovara [Fri, 20 Sep 2013 15:07:18 +0000 (17:07 +0200)]
h264dec: Add .avc file name extension

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoh264dec: K&R formatting cosmetics
Vittorio Giovara [Fri, 20 Sep 2013 15:28:04 +0000 (17:28 +0200)]
h264dec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agomem: Handle av_reallocp(..., 0) properly
Martin Storsjö [Fri, 20 Sep 2013 11:02:41 +0000 (14:02 +0300)]
mem: Handle av_reallocp(..., 0) properly

Previously this did a double free (and returned an error).

Reported-by: Justin Ruggles
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 20 Sep 2013 14:08:19 +0000 (16:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: remove an unused static constant

Merge only for metadata as the constant us not unused in ffmpeg

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