1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

80531 Commits

Author SHA1 Message Date
Michael Bradshaw
989a614b70 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>
2016-06-22 12:12:46 +02:00
Clément Bœsch
5558ff3a9f Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 11:28:51 +02:00
Clément Bœsch
85185578ce lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard 2016-06-22 11:09:19 +02:00
Clément Bœsch
0491d6993a lavc/error_resilience: remove unused skip_last_mv label
Unused since a7b8a6e704
2016-06-22 11:07:54 +02:00
Clément Bœsch
e6247a22c0 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>
2016-06-22 11:06:04 +02:00
Matthieu Bouron
df3484f87c lavc/videotoolbox: fix avcC extradata creation
Fixes properly ticket #5638.

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

This reverts commit b8d754c5d0.
This reverts commit 8e47a99f57.
2016-06-22 10:03:45 +02:00
Michael Niedermayer
e0faad837c 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>
2016-06-22 03:02:47 +02:00
Michael Niedermayer
3f380b9b40 avformat/flvdec: Also print sum_flv_tag_size on size mismatches
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 03:02:47 +02:00
Michael Niedermayer
e8931d79cc avformat/flvdec: Accept last size if its off by 1
Fixes part of Ticket5648

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-22 03:02:47 +02:00
Clément Bœsch
a4403e49b9 Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'
* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
  Reduce the scope of some variables

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:40:56 +02:00
Clément Bœsch
00e122bc0f Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'
* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
  rtsp: Parse SSRC attributes in the SDP

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:26:44 +02:00
Clément Bœsch
4873952f88 Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'
* commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
  rtpdec: Always check if we have the next packet queued

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:24:30 +02:00
Clément Bœsch
91450cda2e Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'
* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
  avconv_vaapi: fix double-free with some unsupported streams

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:22:51 +02:00
Clément Bœsch
475a686a01 Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'
* commit '885a9d6087315a85d98f7e89656ef01dc7104c4c':
  pgssub: Fix subpicture colorspace and range

See 9779b62624

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:20:49 +02:00
Clément Bœsch
e4c07dc4b7 Merge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52'
* commit '1f77e634bb838f71ff21923b5e9fe3104c831c52':
  colorspace: Add support for BT709

See 9779b62624

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:16:16 +02:00
Clément Bœsch
363d4a0e65 Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'
* commit '283226e11ccf50a71d25d150fbbf1743f74c6c49':
  simple_idct_template: Fix strict aliasing violation

See 5df703aa1b

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:12:36 +02:00
Clément Bœsch
e276f21f99 Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'
* commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92':
  avio: Remove a leftover comment

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:10:54 +02:00
Clément Bœsch
8df1dbd798 Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'
* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
  Mark read-only tables as static

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:09:35 +02:00
Clément Bœsch
ea80e90e13 Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'
* commit '1f1ad8ace040a08edc2646ff638ca42a8828779f':
  configure: Document --enable-libfontconfig

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:03:18 +02:00
Clément Bœsch
d0d9dbec2f Merge commit 'def03d14687b9d089950ba8e45083e666de4eb68'
* commit 'def03d14687b9d089950ba8e45083e666de4eb68':
  vf_frei0r: Drop overly verbose and broken debug output

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:00:12 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 21:55:34 +02:00
Aman Gupta
373b82066c 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>
2016-06-21 21:21:30 +02:00
Clément Bœsch
9204a84998 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>
2016-06-21 15:42:49 +02:00
Clément Bœsch
3801060cd0 Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'
* commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f':
  h264: Drop broken trace debug output

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

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 15:38:52 +02:00
Clément Bœsch
d12cce3fb2 Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'
* commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6':
  vaapi: Drop pointless debug output

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 15:36:43 +02:00
Clément Bœsch
14762dd3f3 Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'
* commit '015c2d923902fcd562571993eaf1231ce388c7f0':
  libopencore-amr: Fix ff_dlog()/av_log() invocations

The log changed in our tree in 4a28962454
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>
2016-06-21 15:30:16 +02:00
Clément Bœsch
c01f1157ac Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4':
  Drop pointless assert.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 15:26:20 +02:00
Clément Bœsch
82439dec0f Merge commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2'
* commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2':
  mpegts: Validate the SL Packet Header Configuration

See e630ca5111

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>
2016-06-21 14:46:36 +02:00
Matthieu Bouron
0cd5e281df 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.
2016-06-21 14:20:57 +02:00
Clément Bœsch
72ed8d8bd2 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>
2016-06-21 14:14:21 +02:00
Clément Bœsch
2c2957e23f Merge commit '375cad096565b0796df2a307faae7619766f7c49'
* commit '375cad096565b0796df2a307faae7619766f7c49':
  rtpdec_vp9: Support parsing the scalability structure

This commit is a noop, see cab237953e

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:44:35 +02:00
Clément Bœsch
f17c65ed83 Merge commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768'
* commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768':
  rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log

This commit is a noop, see d50b3fe463

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:43:32 +02:00
Clément Bœsch
4e637eb54d Merge commit 'b55e3633d3f60cf0f51269f25936409b79d2729e'
* commit 'b55e3633d3f60cf0f51269f25936409b79d2729e':
  rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for unimplemented features

This commit is a noop, see 94dee9067a

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:41:35 +02:00
Clément Bœsch
c281028c4d Merge commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc'
* commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc':
  rtpdec_vp9: Update header parsing to spec draft 02

This commit is a noop, see 43880f9716

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:38:54 +02:00
Clément Bœsch
d5fb087e03 Merge commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91'
* commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91':
  rtpdec_vp9: Make sure to free the temp buffer on close

This commit is a noop, see 03aa4cd22b

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:37:50 +02:00
Clément Bœsch
59fced9e26 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>
2016-06-21 13:36:32 +02:00
Clément Bœsch
60e862c91f 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>
2016-06-21 13:36:07 +02:00
Clément Bœsch
d16aefee5c lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges 2016-06-21 13:35:36 +02:00
Clément Bœsch
ba5100ce84 Merge commit '74beead9bd596180bcac6108548fc0a86d8eb4ae'
* commit '74beead9bd596180bcac6108548fc0a86d8eb4ae':
  mmaldec: limit internal buffering

See 14a90c9ef0

The introduction of the MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS check is
merged.

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:32:57 +02:00
Clément Bœsch
a826ffb829 Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'
* commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720':
  mmaldec: print the MMAL format FourCC automatically

This commit is a noop, see d27a12cb09

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:25:09 +02:00
Clément Bœsch
7f2626ccda Merge commit '84bba36846870c6269732351c022eeef094c6c83'
* commit '84bba36846870c6269732351c022eeef094c6c83':
  configure: fix mmal build dependencies

This commit is a noop, see 0badf4564a

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:23:55 +02:00
Clément Bœsch
4db44ea76e Merge commit 'ce589940c2cac936891e8bba275580d6efc41e8b'
* commit 'ce589940c2cac936891e8bba275580d6efc41e8b':
  mmaldec: send only a single EOS packet on flushing

This commit is a noop, see dafe4cd29c

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:22:22 +02:00
Clément Bœsch
a92efb5987 Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'
* commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d':
  mmaldec: correct package buffering accounting

This commit is a noop, see a55fbfa4c4

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:21:50 +02:00
Clément Bœsch
93c75640c9 Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'
* commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3':
  mmaldec: add vc1 decoding support

This commit is a noop, see b07cbf6724

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:21:06 +02:00
Clément Bœsch
c824c3c47c Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'
* commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a':
  mmaldec: Add mpeg2 decoding support

This commit is a noop, see 7ebe12fc55

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:18:47 +02:00
Clément Bœsch
5ffbfe38a5 Merge commit '2689bb115ca64921789092148deaf213a0d94d2e'
* commit '2689bb115ca64921789092148deaf213a0d94d2e':
  mmaldec: Fix avpriv_atomic_get usage

This commit is a noop, see da43e9e157

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:06:11 +02:00
Clément Bœsch
b5f9f16582 Merge commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1'
* commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1':
  mmaldec: Use av_assert0() instead of assert()

This commit is a noop, see c0152ebb9e

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 13:04:40 +02:00
Clément Bœsch
5605c1b3c0 Merge commit 'f2422b58756ba97e3cbadc190f1ed950aa201ec7'
* commit 'f2422b58756ba97e3cbadc190f1ed950aa201ec7':
  testprogs: Mark some tables as static const

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 12:58:56 +02:00
Clément Bœsch
7cf4b442ce Merge commit '5b1409c75563b4a3aca113c34d09e3b5442de47f'
* commit '5b1409c75563b4a3aca113c34d09e3b5442de47f':
  fate: Add test for MSS1

Test was already present, see 849e55e58e.

The merge removes the audio decoding present in our version and
simplifies the rules.

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 12:50:03 +02:00
Clément Bœsch
f36fcf7b6c Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'
* commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869':
  dds: Add support for monochrome images

Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-21 12:29:46 +02:00