avutil/tree: allow adjusting the log level

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

avutil/tree: change debug output to AV_LOG_DEBUG level

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

Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'

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

Conflicts:
libavutil/tree.c

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

Merge commit 'c47037c7a17e4026d38dfa41da27b9f91506725b'

* commit 'c47037c7a17e4026d38dfa41da27b9f91506725b':
  fate: Add timefilter test

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

Merge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd'

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

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

Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'

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

Conflicts:
libavformat/hlsproto.c

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

Merge commit 'c44191039944526dd7eb6e536990b555837961f5'

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

Conflicts:
libavformat/hls.c

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

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>

Merge commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e'

* commit '55c4cba2a7037161ea56b2d55b347c8381df7f1e':
  huffyuvenc: BGRA support

Conflicts:
libavcodec/huffyuvenc.c

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

asfdec: remove "ignoring invalid packet_obj_size" code

The code is no longer needed

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

asfdec: move packet_obj_size to ASFStream

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

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>

doc/filters: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi: add compand filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/kmvc: fix MV checks

Fixes Ticket2813
Fixes regression since 70b5583

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

avutil/tree: K&R formatting cosmetics

fate: Add timefilter test

hls: Free packets when skipping packets when seeking

This fixes memory leaks present since 2b3d041cdc.

Signed-off-by: Martin Storsjö <martin@martin.st>

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>

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>

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>

huffyuvenc: BGRA support

Bug-Id: 452

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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'

avcodec/ff_init_vlc_sparse: use a local array for static vlcs avoiding malloc()

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

avcodec/ff_init_vlc_sparse: use a spinlock for thread sync

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

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>

zmbv: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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>

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>

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>

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>

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>

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>

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>

Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'

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

Conflicts:
libavformat/omadec.c

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

Merge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'

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

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

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>

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>

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>

Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'

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

Conflicts:
libavcodec/flacdec.c

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

Merge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'

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

Conflicts:
libavcodec/xl.c

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

Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

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

Conflicts:
libavcodec/xl.c

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

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>

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>

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>

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>

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>

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>

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>

targaenc: remove unused TargaContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>

truemotion2: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>

pnm: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>

pnm: fix 255 < maxval < 65535 for pam with depth 1

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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.

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.

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

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

oma: refactor seek function

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

oggenc: Write stream metadata if available

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

xl: Make sure the width is valid

And undo the wrong commit f1cb490d6d7391ff7e28cc376908cc98a652228d

CC: libav-stable@libav.org

Avoid overflows when reading pgm files with maxval != 255 and != 65535.

libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.

Assume gray8 if 1 < maxval <= 255 in pgm.

http: Support reading gzip/deflate compressed data

Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

Normally, http servers shouldn't send this to us since we
don't advertise it with an Accept-Encoding header, but some
servers still do it anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>

Set bits_per_raw_sample when decoding mjpeg / ljpeg.

The ljpeg decoder also supports gray images with
8 - 15 bits per component.

lavf/movenc: improve psp check

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

lavf/movenc: remove useless checks on AVOutputFormat

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

utvideoenc: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

ffprobe: add -show_programs option

The option is used to sort the streams by program.

Signed-off-by: Florent Tribouilloy <florent.tribouilloy@smartjog.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

ffprobe: do not treat array elements as nested in the compact writer

This fixes rendering of sections containing nested elements followed by
an array, for example as in the case:
programs->streams->stream

enabled by the -show_programs option.

doc/ffprobe.xsd: specify tag elements in stream after disposition element

Fix XML schema validation, since elements must appear in the same order
as specified in the schema.

aasc: Check minimum buffer size

Prevent some overreads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

qdm2: Whitespace cosmetics

flac: use meaningful return values

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: cosmetics: Consistently format list and table items

Conflicts:
doc/developer.texi
doc/fate.texi

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

Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'

* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
  Add missing deprecation attributes

Conflicts:
libavfilter/avfilter.h

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

Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'

* commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df':
  eval: Explicitly ignore return value of strtod() in parse_db()

Conflicts:
libavutil/eval.c

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

Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'

* commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d':
  Remove unreachable returns

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

Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'

* commit 'c8f0b20b4a6bb6691928789d83e4b02896969848':
  avidec: Let the inner dv demuxer take care of discarding

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

Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'

* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
  avidec: K&R formatting cosmetics

Conflicts:
libavformat/avidec.c

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

xl: Fix the buffer size check

Also make it the first check.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

xl: K&R formatting cosmetics

Merge commit '37063714c0a064808f9671ec4d376955d664f463'

* commit '37063714c0a064808f9671ec4d376955d664f463':
  build: Only check FATE dependencies when running FATE tests

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

Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'

* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
libavcodec/h264.c

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

Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
libavfilter/buffersink.c

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

lavc: do not override format if neither text nor bitmap codec prop is set

Some decoders may output both, this way the decoder can set it.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dpx: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

dpxenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>

targa_y216dec: remove empty function

Signed-off-by: Paul B Mahol <onemda@gmail.com>

zmbv: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>

utvideoenc: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Forward interlaced field information from mov to v210 decoder.

Reported and tested by Dave Rice.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

doc/codecs: fix dangling reference to codec-options chapter

doc: cosmetics: Consistently format list and table items

Add missing deprecation attributes

eval: Explicitly ignore return value of strtod() in parse_db()

The return value is not needed.  This fixes the warning:
libavutil/eval.c:353:15: warning: ignoring return value of ‘strtod’

Remove unreachable returns

avidec: Let the inner dv demuxer take care of discarding

CC: libav-stable@libav.org

avidec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

build: Only check FATE dependencies when running FATE tests

Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.

Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/vorbisenc: change 6 asserts to av_asserts()

speed relevant ones use av_assert2()

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