ffmpeg.git
5 years agodoc/protocols: Document file protocol options
Andrey Utkin [Sun, 14 Jul 2013 10:43:25 +0000 (13:43 +0300)]
doc/protocols: Document file protocol options

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolclenc: remove unused code
Paul B Mahol [Fri, 26 Jul 2013 21:45:10 +0000 (21:45 +0000)]
lclenc: remove unused code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agosunrastenc: do not set avctx->coded_frame
Paul B Mahol [Fri, 26 Jul 2013 14:16:42 +0000 (14:16 +0000)]
sunrastenc: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agojv: make code independent of sizeof(AVFrame)
Paul B Mahol [Wed, 31 Jul 2013 14:57:27 +0000 (14:57 +0000)]
jv: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agomss3: make code independent of sizeof(AVFrame)
Paul B Mahol [Mon, 29 Jul 2013 15:27:05 +0000 (15:27 +0000)]
mss3: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agomss2: make code independent of sizeof(AVFrame)
Paul B Mahol [Mon, 29 Jul 2013 15:20:15 +0000 (15:20 +0000)]
mss2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoindeo2: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 14:58:44 +0000 (14:58 +0000)]
indeo2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agosmacker: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 14:41:38 +0000 (14:41 +0000)]
smacker: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoDocument new 'blocksize' option of 'pipe' protocol
Andrey Utkin [Wed, 31 Jul 2013 12:22:02 +0000 (15:22 +0300)]
Document new 'blocksize' option of 'pipe' protocol

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofile: Add 'blocksize' option
Andrey Utkin [Wed, 31 Jul 2013 12:22:01 +0000 (15:22 +0300)]
file: Add 'blocksize' option

Interruptibility of file operations is strongly desirable in case of
slow storage access, e.g. mounted network share.
This commit introduces possibility to limit data quantity transferred by
'file' protocol at once. By default, old behaviour is preserved and data
is still tried to be transferred without block size limitation.

Note that file I/O operation still may block (or even freeze) inside of
single read(2) or write(2) operation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibxvid: Add SSIM displaying through a libxvidcore plugin
Timothy Gu [Wed, 31 Jul 2013 02:40:45 +0000 (19:40 -0700)]
libxvid: Add SSIM displaying through a libxvidcore plugin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibxvid: add working lumimasking and variance AQ
Timothy Gu [Wed, 31 Jul 2013 02:39:06 +0000 (19:39 -0700)]
libxvid: add working lumimasking and variance AQ

The old implementation is unusable due to change in the Xvid API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 31 Jul 2013 09:01:30 +0000 (11:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Call avformat_find_stream_info() on the chained demuxers

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoSupport for shine 3.0.0
Romain Beauxis [Sun, 21 Jul 2013 20:40:08 +0000 (15:40 -0500)]
Support for shine 3.0.0

5 years agolavf/webvttenc: use proper printf format for int64_t values
Paul B Mahol [Tue, 30 Jul 2013 19:27:43 +0000 (19:27 +0000)]
lavf/webvttenc: use proper printf format for int64_t values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/af_compand: %f is for printing doubles
Michael Niedermayer [Tue, 30 Jul 2013 18:29:46 +0000 (20:29 +0200)]
avfilter/af_compand: %f is for printing doubles

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/get_bits: place volatile at the right spot
Michael Niedermayer [Tue, 30 Jul 2013 18:48:51 +0000 (20:48 +0200)]
avcodec/get_bits: place volatile at the right spot

Should fix Ticket2825

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/get_bits: init_state is used for thread sync, make it volatile
Michael Niedermayer [Tue, 30 Jul 2013 18:26:38 +0000 (20:26 +0200)]
avcodec/get_bits: init_state is used for thread sync, make it volatile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/encoders: add libxvid doc
Timothy Gu [Tue, 30 Jul 2013 02:12:10 +0000 (19:12 -0700)]
doc/encoders: add libxvid doc

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoasfdec: Skip to keyframe after seeking
Michael Niedermayer [Tue, 30 Jul 2013 13:09:13 +0000 (15:09 +0200)]
asfdec: Skip to keyframe after seeking

Fixes Ticket1616

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/timefilter: cleanup the formating of the test output
Michael Niedermayer [Tue, 30 Jul 2013 10:34:34 +0000 (12:34 +0200)]
avdevice/timefilter: cleanup the formating of the test output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/pixfmt: dont refer to deprecated PIX_FMT in the documentation
Michael Niedermayer [Tue, 30 Jul 2013 10:32:05 +0000 (12:32 +0200)]
avutil/pixfmt: dont refer to deprecated PIX_FMT in the documentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/gxfenc: replace deprecated PIX_FMT constants
Michael Niedermayer [Tue, 30 Jul 2013 10:29:20 +0000 (12:29 +0200)]
avformat/gxfenc: replace deprecated PIX_FMT constants

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 30 Jul 2013 10:03:12 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

Conflicts:
libavcodec/g2meet.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1f57d60129b0e297cd197c6031c4439b30a6b503'
Michael Niedermayer [Tue, 30 Jul 2013 09:57:37 +0000 (11:57 +0200)]
Merge commit '1f57d60129b0e297cd197c6031c4439b30a6b503'

* commit '1f57d60129b0e297cd197c6031c4439b30a6b503':
  rtsp: Support RFC4570 (source specific multicast) more properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'
Michael Niedermayer [Tue, 30 Jul 2013 09:51:14 +0000 (11:51 +0200)]
Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'

* commit '74972220909787af5a3ffe66f7fa8041827c2bd2':
  rtpproto: Support more than one SSM include address, support excludes

Conflicts:
libavformat/rtpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7d99c92945e4b2d12ed2126365482e1900340da0'
Michael Niedermayer [Tue, 30 Jul 2013 09:40:05 +0000 (11:40 +0200)]
Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'

* commit '7d99c92945e4b2d12ed2126365482e1900340da0':
  udp: Keep track of include and exclude sources separately

Conflicts:
libavformat/udp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'
Michael Niedermayer [Tue, 30 Jul 2013 09:31:08 +0000 (11:31 +0200)]
Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'

* commit '3357bccc5cb31795f248cd72dc480025f3075a5b':
  udp: Allow specifying multicast include/blocks as host names as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohls: Call avformat_find_stream_info() on the chained demuxers
Michael Niedermayer [Wed, 25 Jul 2012 15:40:33 +0000 (17:40 +0200)]
hls: Call avformat_find_stream_info() on the chained demuxers

This allows the chained demuxer (or more precisely, the lavf
utility code) to better fill in timestamps on packets from
these, especially for cases where one stream is a raw ADTS
stream.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'
Michael Niedermayer [Tue, 30 Jul 2013 09:26:39 +0000 (11:26 +0200)]
Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'

* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8':
  avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79'
Michael Niedermayer [Tue, 30 Jul 2013 09:20:06 +0000 (11:20 +0200)]
Merge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79'

* commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79':
  configure: Detect AIX ar command instead of hardcoding it in the OS section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7'
Michael Niedermayer [Tue, 30 Jul 2013 09:13:34 +0000 (11:13 +0200)]
Merge commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7'

* commit '711c4da1af71e0d26ca93626a3c2dd48821f1cc7':
  fate: Add tree test

Conflicts:
tests/fate/libavutil.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184'
Michael Niedermayer [Tue, 30 Jul 2013 09:06:03 +0000 (11:06 +0200)]
Merge commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184'

* commit 'd99a2b6d0a4d0b2f5ba6a1f1637d6cb88c5c9184':
  avutil/tree: Drop debug messages that clutter the output

Conflicts:
libavutil/tree.c

Merge for metadata only, a better solution has been commited that allows the
debug output to be turned on and off

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/tree: allow adjusting the log level
Michael Niedermayer [Tue, 30 Jul 2013 09:04:48 +0000 (11:04 +0200)]
avutil/tree: allow adjusting the log level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/tree: change debug output to AV_LOG_DEBUG level
Michael Niedermayer [Tue, 30 Jul 2013 09:03:52 +0000 (11:03 +0200)]
avutil/tree: change debug output to AV_LOG_DEBUG level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'
Michael Niedermayer [Tue, 30 Jul 2013 08:42:40 +0000 (10:42 +0200)]
Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'

* commit '10db1a9bca46b0f760a1263d47142b2f57e195d7':
  avutil/tree: K&R formatting cosmetics

Conflicts:
libavutil/tree.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c47037c7a17e4026d38dfa41da27b9f91506725b'
Michael Niedermayer [Tue, 30 Jul 2013 08:30:42 +0000 (10:30 +0200)]
Merge commit 'c47037c7a17e4026d38dfa41da27b9f91506725b'

* commit 'c47037c7a17e4026d38dfa41da27b9f91506725b':
  fate: Add timefilter test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd'
Michael Niedermayer [Tue, 30 Jul 2013 08:25:02 +0000 (10:25 +0200)]
Merge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd'

* commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd':
  hls: Free packets when skipping packets when seeking

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'
Michael Niedermayer [Tue, 30 Jul 2013 08:19:20 +0000 (10:19 +0200)]
Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'

* commit 'a2b7eeeb06471979ee39fd3075a04633222678a6':
  hlsproto: Store all durations in AV_TIME_BASE

Conflicts:
libavformat/hlsproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c44191039944526dd7eb6e536990b555837961f5'
Michael Niedermayer [Tue, 30 Jul 2013 08:12:48 +0000 (10:12 +0200)]
Merge commit 'c44191039944526dd7eb6e536990b555837961f5'

* commit 'c44191039944526dd7eb6e536990b555837961f5':
  hls: Store all durations in AV_TIME_BASE

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'
Michael Niedermayer [Tue, 30 Jul 2013 08:03:02 +0000 (10:03 +0200)]
Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'

* commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce':
  hls: Store first_timestamp in units of AV_TIME_BASE

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'
Michael Niedermayer [Tue, 30 Jul 2013 07:50:26 +0000 (09:50 +0200)]
Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'

* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e':
  huffyuvenc: BGRA support

Conflicts:
libavcodec/huffyuvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoasfdec: remove "ignoring invalid packet_obj_size" code
Michael Niedermayer [Tue, 30 Jul 2013 01:13:30 +0000 (03:13 +0200)]
asfdec: remove "ignoring invalid packet_obj_size" code

The code is no longer needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoasfdec: move packet_obj_size to ASFStream
Michael Niedermayer [Tue, 30 Jul 2013 01:12:28 +0000 (03:12 +0200)]
asfdec: move packet_obj_size to ASFStream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoasfdec: avoid using AVStream->priv_data
Michael Niedermayer [Tue, 30 Jul 2013 00:52:17 +0000 (02:52 +0200)]
asfdec: avoid using AVStream->priv_data

This ensures that we dont write into one struct and read the other without
realizing that they arent identical.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoReplace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents
Diego Biurrun [Mon, 29 Jul 2013 18:48:47 +0000 (20:48 +0200)]
Replace remaining obsolete PIX_FMT names with AV_PIX_FMT equivalents

5 years agodoc/filters: fix typo
Paul B Mahol [Mon, 29 Jul 2013 20:05:21 +0000 (20:05 +0000)]
doc/filters: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agortsp: Support RFC4570 (source specific multicast) more properly.
Ed Torbett [Fri, 26 Jul 2013 10:38:00 +0000 (11:38 +0100)]
rtsp: Support RFC4570 (source specific multicast) more properly.

Add support for domain names, for multiple source addresses,
for exclusions, and for session level specification of addresses.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agortpproto: Support more than one SSM include address, support excludes
Ed Torbett [Fri, 26 Jul 2013 19:37:00 +0000 (22:37 +0300)]
rtpproto: Support more than one SSM include address, support excludes

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoudp: Keep track of include and exclude sources separately
Ed Torbett [Fri, 26 Jul 2013 19:05:21 +0000 (22:05 +0300)]
udp: Keep track of include and exclude sources separately

This allows us to explicitly fail if the caller tried to set
both inclusions and exclusions at the same time.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoudp: Allow specifying multicast include/blocks as host names as well
Ed Torbett [Fri, 26 Jul 2013 18:54:29 +0000 (21:54 +0300)]
udp: Allow specifying multicast include/blocks as host names as well

Previously this only allowed literal IP addresses. When these
are conveyed in a SDP file as in RFC4570, host names are allowed
as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavfi: add compand filter
Paul B Mahol [Tue, 16 Jul 2013 21:39:06 +0000 (21:39 +0000)]
lavfi: add compand filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavcodec/kmvc: fix MV checks
Michael Niedermayer [Mon, 29 Jul 2013 18:43:45 +0000 (20:43 +0200)]
avcodec/kmvc: fix MV checks

Fixes Ticket2813
Fixes regression since 70b5583

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo
Diego Biurrun [Mon, 29 Jul 2013 17:39:51 +0000 (19:39 +0200)]
avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo

Also fix some similar typos in comments and documentation.

5 years agoconfigure: Detect AIX ar command instead of hardcoding it in the OS section
Diego Biurrun [Mon, 29 Jul 2013 16:23:08 +0000 (18:23 +0200)]
configure: Detect AIX ar command instead of hardcoding it in the OS section

5 years agofate: Add tree test
Diego Biurrun [Wed, 17 Oct 2012 17:43:41 +0000 (19:43 +0200)]
fate: Add tree test

5 years agoavutil/tree: Drop debug messages that clutter the output
Diego Biurrun [Tue, 16 Oct 2012 14:08:58 +0000 (16:08 +0200)]
avutil/tree: Drop debug messages that clutter the output

5 years agoavutil/tree: K&R formatting cosmetics
Diego Biurrun [Tue, 16 Oct 2012 14:08:05 +0000 (16:08 +0200)]
avutil/tree: K&R formatting cosmetics

5 years agofate: Add timefilter test
Diego Biurrun [Fri, 5 Oct 2012 17:37:10 +0000 (19:37 +0200)]
fate: Add timefilter test

5 years agohls: Free packets when skipping packets when seeking
Martin Storsjö [Mon, 29 Jul 2013 08:27:44 +0000 (11:27 +0300)]
hls: Free packets when skipping packets when seeking

This fixes memory leaks present since 2b3d041cdc.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohlsproto: Store all durations in AV_TIME_BASE
Martin Storsjö [Mon, 29 Jul 2013 07:27:09 +0000 (10:27 +0300)]
hlsproto: Store all durations in AV_TIME_BASE

Also parse segment durations as floating point, which is allowed
since HLS version 3.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Store all durations in AV_TIME_BASE
Martin Storsjö [Mon, 29 Jul 2013 07:26:02 +0000 (10:26 +0300)]
hls: Store all durations in AV_TIME_BASE

Also parse segment durations as floating point, which is allowed
since HLS version 3.

This is based on a patch by Zhang Rui.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Store first_timestamp in units of AV_TIME_BASE
Martin Storsjö [Mon, 29 Jul 2013 07:09:02 +0000 (10:09 +0300)]
hls: Store first_timestamp in units of AV_TIME_BASE

When first_timestamp was stored as-is, its actual time base
wasn't known later in the seek function.

Additionally, the logic (from 795d9594cfa) for scaling it
based on stream_index is flawed - stream_index in the seek
function only specifies which stream the seek timestamp refers
to, but obviously doesn't say anything about which stream
first_timestamp belongs to.

In the cases where stream_index was >= 0 and all streams had the
same time base, this didn't matter in practice.

Seeking taking first_timestamp into account is problematic
when one variant is mpegts (with real timestamps) and one variant
is raw ADTS (with timestamps only being accumulated packet
duration), where the variants start at totally different timestamps.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohuffyuvenc: BGRA support
Michael Niedermayer [Sun, 10 Mar 2013 10:16:33 +0000 (11:16 +0100)]
huffyuvenc: BGRA support

Bug-Id: 452

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoFix compilation with --disable-everything --enable-shared.
Carl Eugen Hoyos [Mon, 29 Jul 2013 15:52:40 +0000 (17:52 +0200)]
Fix compilation with --disable-everything --enable-shared.

Compilation with --disable-everything --enable-shared failed
on systems with VAAPI support with the following undefined
symbol in libavcodec/vaapi.o:
libavcodec/libavcodec.so: undefined reference to `ff_mpeg_draw_horiz_band'

5 years agoavcodec/ff_init_vlc_sparse: use a local array for static vlcs avoiding malloc()
Michael Niedermayer [Sat, 13 Jul 2013 11:33:49 +0000 (13:33 +0200)]
avcodec/ff_init_vlc_sparse: use a local array for static vlcs avoiding malloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ff_init_vlc_sparse: use a spinlock for thread sync
Michael Niedermayer [Sat, 13 Jul 2013 11:32:39 +0000 (13:32 +0200)]
avcodec/ff_init_vlc_sparse: use a spinlock for thread sync

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "bitstream: make vlc init of static tables thread safe."
Michael Niedermayer [Sat, 13 Jul 2013 00:53:26 +0000 (02:53 +0200)]
Revert "bitstream: make vlc init of static tables thread safe."

This reverts commit 4b6869d6e0120c92253d525921f0e04361888e10.

Conflicts:

libavcodec/bitstream.c

This code can cause assertion failures on artificial OOM situations
It will be replaced by a solution that doesnt have this issue in the
following commits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agozmbv: use av_image_copy_plane()
Paul B Mahol [Mon, 29 Jul 2013 09:59:03 +0000 (09:59 +0000)]
zmbv: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 29 Jul 2013 12:31:38 +0000 (14:31 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Create an AVProgram for each variant

Conflicts:
libavformat/hls.c

See: 23db5418ed2ebaddbbc57a45b81caa6e94724587
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'
Michael Niedermayer [Mon, 29 Jul 2013 12:18:37 +0000 (14:18 +0200)]
Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'

* commit '9d64f236292ba28018dd9afd2d57f8f944b33f81':
  hls: Respect the different stream time bases when comparing dts

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'
Michael Niedermayer [Mon, 29 Jul 2013 12:11:21 +0000 (14:11 +0200)]
Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'

* commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622':
  hls: Set stream offset before opening a chained demuxer

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'
Michael Niedermayer [Mon, 29 Jul 2013 12:04:27 +0000 (14:04 +0200)]
Merge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'

* commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68':
  hls: Don't check discard flags until the parent demuxer's streams actually exist
  hls: Copy the time base from the chained demuxer

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'
Michael Niedermayer [Mon, 29 Jul 2013 11:58:21 +0000 (13:58 +0200)]
Merge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'

* commit 'eb33ba04e03d9f36e23fffd442510c824be709c3':
  hls: Return all packets from a previous variant before moving on to the next one

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'
Michael Niedermayer [Mon, 29 Jul 2013 11:14:29 +0000 (13:14 +0200)]
Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'

* commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34':
  lavf: Don't interpret just slightly broken timestamps as wraparound

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'
Michael Niedermayer [Mon, 29 Jul 2013 10:53:57 +0000 (12:53 +0200)]
Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'

* commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93':
  oma: correctly mark and decrypt partial packets

Conflicts:
libavformat/omadec.c

See: dcd013a535bccbb163b740b72bbedde67dc8e633
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'
Michael Niedermayer [Mon, 29 Jul 2013 10:41:32 +0000 (12:41 +0200)]
Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'

* commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937':
  oma: check geob tag boundary

Conflicts:
libavformat/omadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'
Michael Niedermayer [Mon, 29 Jul 2013 10:21:08 +0000 (12:21 +0200)]
Merge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'

* commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a':
  oma: refactor seek function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'
Michael Niedermayer [Mon, 29 Jul 2013 10:07:11 +0000 (12:07 +0200)]
Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'

* commit '3ca1dd2502a860989ee5289316af6b9816cee78f':
  xl: Make sure the width is valid

Conflicts:
libavcodec/xl.c

See: 94b42da6963a88c9518039e0b8ca42b6aab8bfb3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0f51c398beac87682b2249662b97e30512f7868c'
Michael Niedermayer [Mon, 29 Jul 2013 09:57:30 +0000 (11:57 +0200)]
Merge commit '0f51c398beac87682b2249662b97e30512f7868c'

* commit '0f51c398beac87682b2249662b97e30512f7868c':
  http: Support reading gzip/deflate compressed data
  utvideoenc: use av_image_copy_plane()

Conflicts:
libavformat/http.c
See: b09d86c6366f2933d7bec430486d9d56bf98f7b6
See: 6bab3430a775183f2f9acbd91d1376c71e87c026
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'
Michael Niedermayer [Mon, 29 Jul 2013 09:42:47 +0000 (11:42 +0200)]
Merge commit '62b1e3b1031e901105d78e831120de8e4c3e0013'

* commit '62b1e3b1031e901105d78e831120de8e4c3e0013':
  aasc: Check minimum buffer size

Conflicts:
libavcodec/aasc.c

See: e1631f8ebe9a8f2a9cca85d60160b9be94eb63f3
See: 8a57ca5c6a1c0ad28afa7ea6f824981e6761cce1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
Michael Niedermayer [Mon, 29 Jul 2013 09:34:07 +0000 (11:34 +0200)]
Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'

* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
  qdm2: Whitespace cosmetics
  flac: use meaningful return values

Conflicts:
libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'
Michael Niedermayer [Mon, 29 Jul 2013 09:20:57 +0000 (11:20 +0200)]
Merge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'

* commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d':
  xl: Fix the buffer size check

Conflicts:
libavcodec/xl.c

See: 8c59e0c362b948a746392b65932dd1cfeab8076c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'
Michael Niedermayer [Mon, 29 Jul 2013 09:08:02 +0000 (11:08 +0200)]
Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
  xl: K&R formatting cosmetics

Conflicts:
libavcodec/xl.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohls: Create an AVProgram for each variant
LYF [Fri, 16 Nov 2012 06:12:27 +0000 (14:12 +0800)]
hls: Create an AVProgram for each variant

Without the information, an application may choose audio from one
variant and video from another variant, which leads to fetching two
variants from the network. This enables av_find_best_stream() to find
matching audio and video streams, so that only one variant is fetched.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Respect the different stream time bases when comparing dts
Michael Niedermayer [Mon, 20 Aug 2012 23:00:05 +0000 (01:00 +0200)]
hls: Respect the different stream time bases when comparing dts

Also adjust the streams timestamps according to their start
timestamp when comparing. This helps getting correctly interleaved
packets if one stream lacks timestamps (such as a plain ADTS
stream when the other variants are full mpegts) when the others
have timestamps that don't start from zero.

This probably doesn't work properly if such a stream is
temporarily disabled (via the discard flags) and then reenabled,
and such streams are hard to correctly sync against the other
streams as well - but this works better than before at least.

The segment number restriction makes sure all variants advance
roughly at the same pace as well.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Set stream offset before opening a chained demuxer
Martin Storsjö [Sun, 28 Jul 2013 17:33:26 +0000 (20:33 +0300)]
hls: Set stream offset before opening a chained demuxer

This makes sure we don't accidentally check discard flags
for the wrong stream.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Don't check discard flags until the parent demuxer's streams actually exist
Michael Niedermayer [Mon, 13 Aug 2012 18:37:04 +0000 (20:37 +0200)]
hls: Don't check discard flags until the parent demuxer's streams actually exist

If passing the end of one segment while initializing the
chained demuxer, the parent demuxer's streams aren't set up
yet, so we can't recheck the discard flags.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Copy the time base from the chained demuxer
Michael Niedermayer [Thu, 7 Mar 2013 12:42:12 +0000 (13:42 +0100)]
hls: Copy the time base from the chained demuxer

When a variant stream isn't mpegts but e.g. raw adts, the
default time base (90k) isn't correct.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agohls: Return all packets from a previous variant before moving on to the next one
Martin Storsjö [Sun, 28 Jul 2013 17:09:31 +0000 (20:09 +0300)]
hls: Return all packets from a previous variant before moving on to the next one

This serves as a safeguard; normally we want to use the dts
comparison to interleave packets from all active variants. If that
dts comparison for some reason doesn't work as intended, make sure
that all packets in all variants for a certain sequence number have
been returned before moving on to the next one.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavf: Don't interpret just slightly broken timestamps as wraparound
Michael Niedermayer [Sun, 28 Jul 2013 17:04:05 +0000 (20:04 +0300)]
lavf: Don't interpret just slightly broken timestamps as wraparound

This avoids breaking some slightly incorrect (dts > pts) timestamps
in sample HLS streams from Apple.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agotargaenc: remove unused TargaContext
Paul B Mahol [Fri, 26 Jul 2013 21:35:48 +0000 (21:35 +0000)]
targaenc: remove unused TargaContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agotruemotion2: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 14:49:12 +0000 (14:49 +0000)]
truemotion2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agopnm: do not set avctx->coded_frame
Paul B Mahol [Sun, 28 Jul 2013 21:16:07 +0000 (21:16 +0000)]
pnm: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agopnm: fix 255 < maxval < 65535 for pam with depth 1
Paul B Mahol [Sun, 28 Jul 2013 21:18:51 +0000 (21:18 +0000)]
pnm: fix 255 < maxval < 65535 for pam with depth 1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoRevert "Avoid overflows when reading pgm files with maxval != 255 and != 65535."
Carl Eugen Hoyos [Sun, 28 Jul 2013 22:05:43 +0000 (00:05 +0200)]
Revert "Avoid overflows when reading pgm files with maxval != 255 and != 65535."

The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.

This reverts commit 7651c0e49b1f6e66120ef32570a87e3f09224574.

5 years agoRevert "pnm: remove nonsense code"
Paul B Mahol [Sun, 28 Jul 2013 21:42:47 +0000 (21:42 +0000)]
Revert "pnm: remove nonsense code"

Breaks decoding pgms with 256 < maxval < 65535.

Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.
This reverts commit a0348d0966a81a66f3a1bf061576b24d5296b933.

5 years agooma: correctly mark and decrypt partial packets
Luca Barbato [Wed, 17 Apr 2013 19:19:23 +0000 (21:19 +0200)]
oma: correctly mark and decrypt partial packets

Incomplete crypted files would lead to a read after buffer boundary
otherwise.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agooma: check geob tag boundary
Luca Barbato [Wed, 17 Apr 2013 19:07:09 +0000 (21:07 +0200)]
oma: check geob tag boundary

Prevent read after buffer boundary on corrupted tag.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
5 years agooma: refactor seek function
Luca Barbato [Sat, 4 May 2013 05:40:09 +0000 (07:40 +0200)]
oma: refactor seek function

Properly propagate seek errors from avio and the generic pcm seek.