ffmpeg.git
4 years agoMerge commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9'
Matthieu Bouron [Thu, 23 Jun 2016 20:20:10 +0000 (22:20 +0200)]
Merge commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9'

* commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9':
  movenc: Add a test for VFR with b-frames, with a duration change at a fragment end

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
4 years agoMerge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'
Matthieu Bouron [Thu, 23 Jun 2016 20:02:31 +0000 (22:02 +0200)]
Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'

* commit 'e1eb0fc960163402bbb4e630185790488f7d28ed':
  movenc: Use packets in interleaving queues for the duration at the end of fragments

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
4 years agoavformat/g729dec: Fix av_log() formating string
Michael Niedermayer [Thu, 23 Jun 2016 19:37:05 +0000 (21:37 +0200)]
avformat/g729dec: Fix av_log() formating string

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libx264: Remove unused variable
Michael Niedermayer [Thu, 23 Jun 2016 19:36:02 +0000 (21:36 +0200)]
avcodec/libx264: Remove unused variable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMAINTAINERS: purge a bunch of entries
Clément Bœsch [Thu, 23 Jun 2016 17:25:16 +0000 (19:25 +0200)]
MAINTAINERS: purge a bunch of entries

This is definitely not complete.

Anton, Diego and Luca are still maintaining their code in Libav, but are
unwilling to do so in FFmpeg, so removing these entries will prevent
them from getting poked by our users.

Måns, Justin, Kostya and Jason left both projects a while ago.

4 years agoMerge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'
Matthieu Bouron [Thu, 23 Jun 2016 16:03:49 +0000 (18:03 +0200)]
Merge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'

* commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7':
  movenc-test: Test write_data_type

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
4 years agoMerge commit '71852a1ba89abc8749e309d9d662c49d47e19531'
Matthieu Bouron [Thu, 23 Jun 2016 15:57:34 +0000 (17:57 +0200)]
Merge commit '71852a1ba89abc8749e309d9d662c49d47e19531'

* commit '71852a1ba89abc8749e309d9d662c49d47e19531':
  matroskaenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
4 years agotests/api: add .gitignore
Clément Bœsch [Thu, 23 Jun 2016 15:49:32 +0000 (17:49 +0200)]
tests/api: add .gitignore

Fixes regression since 5d48e4eafa6c4559683892b8638d10508125f3cf

4 years agoMerge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'
Matthieu Bouron [Thu, 23 Jun 2016 15:52:14 +0000 (17:52 +0200)]
Merge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'

* commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401':
  movenc: Provide output bytestream markers for fragmented content

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
4 years agoMerge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'
Matthieu Bouron [Thu, 23 Jun 2016 15:43:19 +0000 (17:43 +0200)]
Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'

* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
  flvenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
4 years agoMerge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'
Matthieu Bouron [Thu, 23 Jun 2016 13:27:00 +0000 (15:27 +0200)]
Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'

* commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca':
  avio: Allow custom IO users to get labels for the output bytestream

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
4 years agolavc/mediacodec: increase buffer dequeue timeout when the codec needs to be drained
Matthieu Bouron [Mon, 20 Jun 2016 16:15:21 +0000 (18:15 +0200)]
lavc/mediacodec: increase buffer dequeue timeout when the codec needs to be drained

Increase buffer dequeue timeout when the codec needs to be drained as it
could happen that no input buffer is available when we receive a null
packet for the first time (meaning we are unable to signal end of stream
and mark the codec as draining).

Fixes potential loss of last frames after sending a null packet.

4 years agolavc/mediacodec: rely on buffer flags to detect end of stream
Matthieu Bouron [Mon, 20 Jun 2016 14:41:21 +0000 (16:41 +0200)]
lavc/mediacodec: rely on buffer flags to detect end of stream

4 years agolavc/mediacodec: re-indent after previous commit
Matthieu Bouron [Mon, 20 Jun 2016 14:30:21 +0000 (16:30 +0200)]
lavc/mediacodec: re-indent after previous commit

4 years agolavc/mediacodec: discard 0-sized buffers
Matthieu Bouron [Mon, 20 Jun 2016 14:29:18 +0000 (16:29 +0200)]
lavc/mediacodec: discard 0-sized buffers

Their only purpose is to carry the end of stream flag.

4 years agoffprobe: print stereo3d information
Clément Bœsch [Thu, 23 Jun 2016 11:36:39 +0000 (13:36 +0200)]
ffprobe: print stereo3d information

Based on 8e757716c61e0563a63829e30b02d5ba2a422ad6

See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.

4 years agoffprobe: refactor pkt side data printing
Clément Bœsch [Thu, 23 Jun 2016 11:36:18 +0000 (13:36 +0200)]
ffprobe: refactor pkt side data printing

4 years agoMerge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'
Clément Bœsch [Thu, 23 Jun 2016 11:47:01 +0000 (13:47 +0200)]
Merge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'

* commit '8e757716c61e0563a63829e30b02d5ba2a422ad6':
  avprobe: Print stereo3d information

This commit is not merged as it doesn't apply at all in our tree. The
two following commits will add the same feature.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoavcodec: remove libutvideo wrapper support
Derek Buitenhuis [Wed, 22 Jun 2016 11:31:32 +0000 (13:31 +0200)]
avcodec: remove libutvideo wrapper support

The 10-bit decoding support is available now in native decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/sheervideo: fix YbYr format decoding
Paul B Mahol [Thu, 23 Jun 2016 10:55:30 +0000 (12:55 +0200)]
avcodec/sheervideo: fix YbYr format decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'
Clément Bœsch [Thu, 23 Jun 2016 10:38:51 +0000 (12:38 +0200)]
Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'

* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
  stereo3d: Add API to get name from value or value from name

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'd621b2f795684f7119057f986066060adbe84220'
Clément Bœsch [Thu, 23 Jun 2016 10:26:16 +0000 (12:26 +0200)]
Merge commit 'd621b2f795684f7119057f986066060adbe84220'

* commit 'd621b2f795684f7119057f986066060adbe84220':
  lavf: Raw G.729 demuxer

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'
Clément Bœsch [Thu, 23 Jun 2016 10:16:42 +0000 (12:16 +0200)]
Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'

* commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
  fate: Update fate-lavf-ts after commit 393596f9d5

This commit is a noop, see c0ff42bf6468c7440568ec15c81edc52289f0c8a

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'
Clément Bœsch [Thu, 23 Jun 2016 10:14:45 +0000 (12:14 +0200)]
Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'

* commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8':
  tools: Port to codec parameters API

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoavformat/mov: add more datatypes in metadata handling
David Murmann [Wed, 22 Jun 2016 13:20:33 +0000 (15:20 +0200)]
avformat/mov: add more datatypes in metadata handling

Implement variable sized big-endian integers, since these are found
in files created by ARRI cameras.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '393596f9d51134d6e45d81ae129223f4faea1232'
Clément Bœsch [Thu, 23 Jun 2016 06:15:43 +0000 (08:15 +0200)]
Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'

* commit '393596f9d51134d6e45d81ae129223f4faea1232':
  mpegtsenc: stop impersonating ses in sdt

This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7 on
Libav side.

Merged-by: Clément Bœsch <u@pkh.me>
4 years agodshow: avoid duplicate NULL check before free
rogerdpack [Fri, 17 Jun 2016 20:04:34 +0000 (14:04 -0600)]
dshow: avoid duplicate NULL check before free

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodshow: don't add two instances of same device to graphs
rogerdpack [Wed, 15 Jun 2016 08:17:11 +0000 (02:17 -0600)]
dshow: don't add two instances of same device to graphs

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMAINTAINERS: Remove Linux / PowerPC maintainer
Michael Niedermayer [Wed, 22 Jun 2016 22:49:29 +0000 (00:49 +0200)]
MAINTAINERS: Remove Linux / PowerPC maintainer

See: [FFmpeg-devel] PPC64: PowerPC Maintainer information is incorrect

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agofate: add apad test
Petru Rares Sincraian [Wed, 22 Jun 2016 13:24:26 +0000 (15:24 +0200)]
fate: add apad test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc: fix previous merge
Clément Bœsch [Wed, 22 Jun 2016 22:42:16 +0000 (00:42 +0200)]
lavc: fix previous merge

4 years agoMerge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'
Clément Bœsch [Wed, 22 Jun 2016 22:29:25 +0000 (00:29 +0200)]
Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'

* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c':
  Move VLC and RL_VLC_ELEM structure definitions to a separate header

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'
Hendrik Leppkes [Wed, 22 Jun 2016 21:36:37 +0000 (23:36 +0200)]
Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'

* commit 'b23613268c6b56a8f9de7859562d82b4b88353d9':
  avconv_dxva2: use the hwcontext API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agohwcontext_dxva2: support P010 10-bit surfaces
Hendrik Leppkes [Wed, 22 Jun 2016 21:27:30 +0000 (23:27 +0200)]
hwcontext_dxva2: support P010 10-bit surfaces

4 years agofate: add test for amerge
Petru Rares Sincraian [Tue, 21 Jun 2016 12:43:01 +0000 (14:43 +0200)]
fate: add test for amerge

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
Hendrik Leppkes [Wed, 22 Jun 2016 20:38:49 +0000 (22:38 +0200)]
Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'

* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
  hwcontext: add a dxva2 implementation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavformat/flacdec: Fix seeking close to EOF
Michael Niedermayer [Wed, 22 Jun 2016 18:33:09 +0000 (20:33 +0200)]
avformat/flacdec: Fix seeking close to EOF

Fixes Ticket5428

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/flac_parser: Raise threshold for detecting invalid data
Michael Niedermayer [Wed, 22 Jun 2016 18:19:40 +0000 (20:19 +0200)]
avcodec/flac_parser: Raise threshold for detecting invalid data

Fixes regression from Ticket5428

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/get_bits: add a logging context to check_marker()
Clément Bœsch [Wed, 22 Jun 2016 18:07:46 +0000 (20:07 +0200)]
lavc/get_bits: add a logging context to check_marker()

Based on d338abb664febbc2c7266af7818aab1f12dbc161

4 years agoMerge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'
Clément Bœsch [Wed, 22 Jun 2016 18:05:03 +0000 (20:05 +0200)]
Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'

* commit 'd338abb664febbc2c7266af7818aab1f12dbc161':
  mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL

This commit is a noop.

Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'
Clément Bœsch [Wed, 22 Jun 2016 17:57:11 +0000 (19:57 +0200)]
Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'

* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
  Move check_marker() from get_bits to mpeg4videodec

Not merged, check_marker() is used in various other places in FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'
Clément Bœsch [Wed, 22 Jun 2016 17:51:36 +0000 (19:51 +0200)]
Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'

* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
  lavc: mark the old audio/video encoding API as deprecated

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'
Clément Bœsch [Wed, 22 Jun 2016 17:40:49 +0000 (19:40 +0200)]
Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'

* commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
  x86inc: Enable AVX emulation in additional cases

This commit is a noop, see e428f3b30cebbc2beafb3ff2972dbf8b47bc4a70

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'
Clément Bœsch [Wed, 22 Jun 2016 17:40:29 +0000 (19:40 +0200)]
Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'

* commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
  x86inc: Improve handling of %ifid with multi-token parameters

This commit is a noop, see 4bd5583acea5d65a2f8fd8fcd5ab7b404af23f45

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f'
Clément Bœsch [Wed, 22 Jun 2016 17:39:13 +0000 (19:39 +0200)]
Merge commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f'

* commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f':
  x86inc: Fix AVX emulation of some instructions

This commit is a noop, see 42be240ad6874fbc2b0e88a3ee133ece58d60692

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'
Clément Bœsch [Wed, 22 Jun 2016 17:38:53 +0000 (19:38 +0200)]
Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'

* commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc':
  x86inc: Fix AVX emulation of scalar float instructions

This commit is a noop, see 8dd3ee9dddcaf1d538252d77dd2af3ea139f4f96

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '8996515b137f962e3a8691241c285c96437b6c53'
Clément Bœsch [Wed, 22 Jun 2016 17:32:00 +0000 (19:32 +0200)]
Merge commit '8996515b137f962e3a8691241c285c96437b6c53'

* commit '8996515b137f962e3a8691241c285c96437b6c53':
  avpacket: fix setting AVPacket.data in av_packet_ref()

This commit is a noop, see ed3a02547c71ac06fa27f17ad53116a74f78d927

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'
Clément Bœsch [Wed, 22 Jun 2016 17:29:56 +0000 (19:29 +0200)]
Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'

* commit 'e62ff72fc1052273deb708ba715f73e5187281d4':
  lavc: make avcodec_open2() fail when the timebase is not set for encoding

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoavcodec/tests/options: Set timebase
Michael Niedermayer [Wed, 22 Jun 2016 16:39:39 +0000 (18:39 +0200)]
avcodec/tests/options: Set timebase

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'
Clément Bœsch [Wed, 22 Jun 2016 15:36:42 +0000 (17:36 +0200)]
Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'

* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
  Combine deprecation guards where appropriate

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavf/img2dec: add pnm pipe demuxers
Clément Bœsch [Wed, 8 Jun 2016 13:16:34 +0000 (15:16 +0200)]
lavf/img2dec: add pnm pipe demuxers

4 years agoavformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate...
Michael Niedermayer [Wed, 22 Jun 2016 11:59:19 +0000 (13:59 +0200)]
avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed

The internal avctx bitrate is copied into codecpar after estimate_timings()

Fixes Ticket5646

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()
Michael Niedermayer [Wed, 22 Jun 2016 11:58:42 +0000 (13:58 +0200)]
avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswr: fix time.h include
Clément Bœsch [Wed, 22 Jun 2016 12:00:08 +0000 (14:00 +0200)]
swr: fix time.h include

4 years agoMerge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
Clément Bœsch [Wed, 22 Jun 2016 11:44:29 +0000 (13:44 +0200)]
Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'

* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolibavformat/matroskaenc: omit segment UID for webm
Michael Bradshaw [Mon, 20 Jun 2016 21:25:48 +0000 (14:25 -0700)]
libavformat/matroskaenc: omit segment UID for webm

SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUID

Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
Clément Bœsch [Wed, 22 Jun 2016 09:25:49 +0000 (11:25 +0200)]
Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'

* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard
Clément Bœsch [Wed, 22 Jun 2016 09:09:19 +0000 (11:09 +0200)]
lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard

4 years agolavc/error_resilience: remove unused skip_last_mv label
Clément Bœsch [Wed, 22 Jun 2016 09:07:54 +0000 (11:07 +0200)]
lavc/error_resilience: remove unused skip_last_mv label

Unused since a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886

4 years agoMerge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'
Clément Bœsch [Wed, 22 Jun 2016 09:06:04 +0000 (11:06 +0200)]
Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'

* commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b':
  Add some more deprecation guards

- psnr() deprecation is not merged within ffmpeg.c as we still use it in
  non-deprecated code

- the XVMC chunk is not merged as we still apparently maintain it

- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavc/videotoolbox: fix avcC extradata creation
Matthieu Bouron [Tue, 21 Jun 2016 14:09:06 +0000 (16:09 +0200)]
lavc/videotoolbox: fix avcC extradata creation

Fixes properly ticket #5638.

Since 772ad7142dff590c7bb30370acf5d3c9a8fb512b PPS and SPS contain the
nal type byte.

This reverts commit b8d754c5d0a2e99022c27bd1159ea3f597f67452.
This reverts commit 8e47a99f576da10b2a36e33b6b9acbf1c2da7485.

4 years agoavformat/flvdec: Do not check last size if it could not be read due to EOF
Michael Niedermayer [Tue, 21 Jun 2016 21:40:05 +0000 (23:40 +0200)]
avformat/flvdec: Do not check last size if it could not be read due to EOF

Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/flvdec: Also print sum_flv_tag_size on size mismatches
Michael Niedermayer [Tue, 21 Jun 2016 21:39:24 +0000 (23:39 +0200)]
avformat/flvdec: Also print sum_flv_tag_size on size mismatches

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/flvdec: Accept last size if its off by 1
Michael Niedermayer [Tue, 21 Jun 2016 21:38:23 +0000 (23:38 +0200)]
avformat/flvdec: Accept last size if its off by 1

Fixes part of Ticket5648

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'
Clément Bœsch [Tue, 21 Jun 2016 20:40:56 +0000 (22:40 +0200)]
Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'

* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
  Reduce the scope of some variables

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'
Clément Bœsch [Tue, 21 Jun 2016 20:26:44 +0000 (22:26 +0200)]
Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'

* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
  rtsp: Parse SSRC attributes in the SDP

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'
Clément Bœsch [Tue, 21 Jun 2016 20:24:30 +0000 (22:24 +0200)]
Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'

* commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
  rtpdec: Always check if we have the next packet queued

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '0c1d66a07917602303f129f5a5651faeec2415d5'
Clément Bœsch [Tue, 21 Jun 2016 20:22:51 +0000 (22:22 +0200)]
Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'

* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
  avconv_vaapi: fix double-free with some unsupported streams

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'
Clément Bœsch [Tue, 21 Jun 2016 20:20:49 +0000 (22:20 +0200)]
Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'

* commit '885a9d6087315a85d98f7e89656ef01dc7104c4c':
  pgssub: Fix subpicture colorspace and range

See 9779b6262471d553c1ed811ff7312564e39d8adf

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52'
Clément Bœsch [Tue, 21 Jun 2016 20:16:16 +0000 (22:16 +0200)]
Merge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52'

* commit '1f77e634bb838f71ff21923b5e9fe3104c831c52':
  colorspace: Add support for BT709

See 9779b6262471d553c1ed811ff7312564e39d8adf

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'
Clément Bœsch [Tue, 21 Jun 2016 20:12:36 +0000 (22:12 +0200)]
Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'

* commit '283226e11ccf50a71d25d150fbbf1743f74c6c49':
  simple_idct_template: Fix strict aliasing violation

See 5df703aa1b03814e9cd216ab703501481166b3bb

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'
Clément Bœsch [Tue, 21 Jun 2016 20:10:54 +0000 (22:10 +0200)]
Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'

* commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92':
  avio: Remove a leftover comment

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'
Clément Bœsch [Tue, 21 Jun 2016 20:09:35 +0000 (22:09 +0200)]
Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'

* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
  Mark read-only tables as static

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'
Clément Bœsch [Tue, 21 Jun 2016 20:03:18 +0000 (22:03 +0200)]
Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'

* commit '1f1ad8ace040a08edc2646ff638ca42a8828779f':
  configure: Document --enable-libfontconfig

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit 'def03d14687b9d089950ba8e45083e666de4eb68'
Clément Bœsch [Tue, 21 Jun 2016 19:59:21 +0000 (21:59 +0200)]
Merge commit 'def03d14687b9d089950ba8e45083e666de4eb68'

* commit 'def03d14687b9d089950ba8e45083e666de4eb68':
  vf_frei0r: Drop overly verbose and broken debug output

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoMerge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
Clément Bœsch [Tue, 21 Jun 2016 19:55:20 +0000 (21:55 +0200)]
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
4 years agoavformat/mpegts: include stream type for aac
Aman Gupta [Tue, 14 Jun 2016 18:08:55 +0000 (11:08 -0700)]
avformat/mpegts: include stream type for aac

this removes the need to probe to discover aac streams
inside mpegts containers, thus speeding up initial playback.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'
Clément Bœsch [Tue, 21 Jun 2016 13:42:49 +0000 (15:42 +0200)]
Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'

* commit '5c31eaa9998b2185e0aa04d11adff128498dc14a':
  Remove unnecessary get_bits.h #includes and add missing headers where needed.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'
Clément Bœsch [Tue, 21 Jun 2016 13:38:52 +0000 (15:38 +0200)]
Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'

* commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f':
  h264: Drop broken trace debug output

This commit is not merged as the debug was fixed in
94011f994ab2e531a49fabbb2c86e735f87df3ca.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'
Clément Bœsch [Tue, 21 Jun 2016 13:36:43 +0000 (15:36 +0200)]
Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'

* commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6':
  vaapi: Drop pointless debug output

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '015c2d923902fcd562571993eaf1231ce388c7f0'
Clément Bœsch [Tue, 21 Jun 2016 13:30:16 +0000 (15:30 +0200)]
Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'

* commit '015c2d923902fcd562571993eaf1231ce388c7f0':
  libopencore-amr: Fix ff_dlog()/av_log() invocations

The log changed in our tree in 4a289624545c559107fac93597b23289a8b15c9f
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'
Clément Bœsch [Tue, 21 Jun 2016 13:24:59 +0000 (15:24 +0200)]
Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'

* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4':
  Drop pointless assert.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2'
Clément Bœsch [Tue, 21 Jun 2016 12:37:55 +0000 (14:37 +0200)]
Merge commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2'

* commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2':
  mpegts: Validate the SL Packet Header Configuration

See e630ca5111077fa8adc972fe8a3d7e2b3e8dc91f

Our local timestamp_len > 64 is adjusted to > 63 to match the Libav
check and the actual specifications (14496-1, 10.2.2).

There is no need to request a sample as it violates the specifications
and such a file would likely be the result of a crafted/fuzzed sample.

On the other hand, the clipping of the value is kept for extra safety.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavc/mediacodecdec_h264: use ff_h264_decode_extradata to extract PPS/SPS
Matthieu Bouron [Fri, 10 Jun 2016 11:16:09 +0000 (13:16 +0200)]
lavc/mediacodecdec_h264: use ff_h264_decode_extradata to extract PPS/SPS

Fixes playback of HLS streams on MediaTek devices which requires PPS/SPS
to be set in their respective csd-{0,1} buffers.

4 years agoMerge commit '1982d0cc561912d685a0c2dbe58bc19f50bae231'
Clément Bœsch [Tue, 21 Jun 2016 11:45:40 +0000 (13:45 +0200)]
Merge commit '1982d0cc561912d685a0c2dbe58bc19f50bae231'

* commit '1982d0cc561912d685a0c2dbe58bc19f50bae231':
  fate: Add test for MTS2/MSS4

The timestamps differ because we use a more appropriate timebase.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '375cad096565b0796df2a307faae7619766f7c49'
Clément Bœsch [Tue, 21 Jun 2016 11:44:35 +0000 (13:44 +0200)]
Merge commit '375cad096565b0796df2a307faae7619766f7c49'

* commit '375cad096565b0796df2a307faae7619766f7c49':
  rtpdec_vp9: Support parsing the scalability structure

This commit is a noop, see cab237953ea60963c627df53833513a0764ff8fe

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768'
Clément Bœsch [Tue, 21 Jun 2016 11:43:32 +0000 (13:43 +0200)]
Merge commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768'

* commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768':
  rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log

This commit is a noop, see d50b3fe463138a8378d0d0884750bd71db825c82

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'b55e3633d3f60cf0f51269f25936409b79d2729e'
Clément Bœsch [Tue, 21 Jun 2016 11:41:35 +0000 (13:41 +0200)]
Merge commit 'b55e3633d3f60cf0f51269f25936409b79d2729e'

* commit 'b55e3633d3f60cf0f51269f25936409b79d2729e':
  rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for unimplemented features

This commit is a noop, see 94dee9067acd6439550ccc4bdfef1694814ea0bc

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc'
Clément Bœsch [Tue, 21 Jun 2016 11:38:54 +0000 (13:38 +0200)]
Merge commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc'

* commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc':
  rtpdec_vp9: Update header parsing to spec draft 02

This commit is a noop, see 43880f971662c6f79f58ffb373200306e155e0f5

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91'
Clément Bœsch [Tue, 21 Jun 2016 11:37:50 +0000 (13:37 +0200)]
Merge commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91'

* commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91':
  rtpdec_vp9: Make sure to free the temp buffer on close

This commit is a noop, see 03aa4cd22b4b1522260355c499729c08ce640732

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'c26741332165a049717e6da84db13a24ee8edade'
Clément Bœsch [Tue, 21 Jun 2016 11:36:32 +0000 (13:36 +0200)]
Merge commit 'c26741332165a049717e6da84db13a24ee8edade'

* commit 'c26741332165a049717e6da84db13a24ee8edade':
  Revert "mmaldec: autodetect by default" since it breaks linking on systems without mmal libraries

This commit is not merged as the previous one wasn't either.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'
Clément Bœsch [Tue, 21 Jun 2016 11:36:07 +0000 (13:36 +0200)]
Merge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'

* commit '33ac77e850efdfd0e8835950c3d947baffd4df45':
  mmaldec: autodetect by default

This commit is not merged (it will be reverted in the next one to
merge).

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agolavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges
Clément Bœsch [Tue, 21 Jun 2016 11:35:31 +0000 (13:35 +0200)]
lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges

4 years agoMerge commit '74beead9bd596180bcac6108548fc0a86d8eb4ae'
Clément Bœsch [Tue, 21 Jun 2016 11:31:15 +0000 (13:31 +0200)]
Merge commit '74beead9bd596180bcac6108548fc0a86d8eb4ae'

* commit '74beead9bd596180bcac6108548fc0a86d8eb4ae':
  mmaldec: limit internal buffering

See 14a90c9ef09a4b046500dceab5ca1875e330a376

The introduction of the MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS check is
merged.

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'
Clément Bœsch [Tue, 21 Jun 2016 11:25:09 +0000 (13:25 +0200)]
Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'

* commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720':
  mmaldec: print the MMAL format FourCC automatically

This commit is a noop, see d27a12cb0982921e503e68692bb99b6dfe1a6144

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '84bba36846870c6269732351c022eeef094c6c83'
Clément Bœsch [Tue, 21 Jun 2016 11:23:55 +0000 (13:23 +0200)]
Merge commit '84bba36846870c6269732351c022eeef094c6c83'

* commit '84bba36846870c6269732351c022eeef094c6c83':
  configure: fix mmal build dependencies

This commit is a noop, see 0badf4564a90ffa6f104b275277a6015a1d33905

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'ce589940c2cac936891e8bba275580d6efc41e8b'
Clément Bœsch [Tue, 21 Jun 2016 11:22:22 +0000 (13:22 +0200)]
Merge commit 'ce589940c2cac936891e8bba275580d6efc41e8b'

* commit 'ce589940c2cac936891e8bba275580d6efc41e8b':
  mmaldec: send only a single EOS packet on flushing

This commit is a noop, see dafe4cd29cada351a2785433b24401fc602911c4

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'
Clément Bœsch [Tue, 21 Jun 2016 11:21:50 +0000 (13:21 +0200)]
Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'

* commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d':
  mmaldec: correct package buffering accounting

This commit is a noop, see a55fbfa4c4967068a9c37f041110ace9fb633d4e

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'
Clément Bœsch [Tue, 21 Jun 2016 11:21:06 +0000 (13:21 +0200)]
Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'

* commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3':
  mmaldec: add vc1 decoding support

This commit is a noop, see b07cbf6724207ba768ebb2ccdee1b6749fd6ca31

Merged-by: Clément Bœsch <clement@stupeflix.com>
4 years agoMerge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'
Clément Bœsch [Tue, 21 Jun 2016 11:18:47 +0000 (13:18 +0200)]
Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'

* commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a':
  mmaldec: Add mpeg2 decoding support

This commit is a noop, see 7ebe12fc55591053cbd194ca6638e5c32beaee45

Merged-by: Clément Bœsch <clement@stupeflix.com>