summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'Clément Bœsch2016-06-211-2/+0
|\ | | | | | | | | | | | | * commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92': avio: Remove a leftover comment Merged-by: Clément Bœsch <u@pkh.me>
| * avio: Remove a leftover commentMartin Storsjö2016-05-061-2/+0
| | | | | | | | | | | | | | The declarations that this comment referred to were removed in 2439f2ca8 - there is no unbuffered IO in this header now. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'Clément Bœsch2016-06-217-14/+14
|\ \ | |/ | | | | | | | | | | * commit '5afb94c817abffad030c6b94d7003dca8aace3d5': Mark read-only tables as static Merged-by: Clément Bœsch <u@pkh.me>
| * Mark read-only tables as staticDiego Biurrun2016-05-0515-28/+29
| |
* | Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'Clément Bœsch2016-06-211-1/+1
|\ \ | |/ | | | | | | | | | | * commit '1f1ad8ace040a08edc2646ff638ca42a8828779f': configure: Document --enable-libfontconfig Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Document --enable-libfontconfigDiego Biurrun2016-05-051-0/+1
| |
* | Merge commit 'def03d14687b9d089950ba8e45083e666de4eb68'Clément Bœsch2016-06-211-48/+0
|\ \ | |/ | | | | | | | | | | * commit 'def03d14687b9d089950ba8e45083e666de4eb68': vf_frei0r: Drop overly verbose and broken debug output Merged-by: Clément Bœsch <u@pkh.me>
| * vf_frei0r: Drop overly verbose and broken debug outputDiego Biurrun2016-05-041-48/+0
| |
* | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21320-871/+870
|\ \ | |/ | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-04361-964/+962
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/mpegts: include stream type for aacAman Gupta2016-06-211-0/+1
| | | | | | | | | | | | | | | | 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>
* | Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'Clément Bœsch2016-06-2110-11/+20
|\ \ | |/ | | | | | | | | | | * commit '5c31eaa9998b2185e0aa04d11adff128498dc14a': Remove unnecessary get_bits.h #includes and add missing headers where needed. Merged-by: Clément Bœsch <clement@stupeflix.com>
| * Remove unnecessary get_bits.h #includes and add missing headers where needed.Alexandra Hájková2016-05-0411-13/+19
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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>
| * h264: Drop broken trace debug outputDiego Biurrun2016-05-032-2/+0
| |
* | Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'Clément Bœsch2016-06-215-20/+0
|\ \ | |/ | | | | | | | | | | * commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6': vaapi: Drop pointless debug output Merged-by: Clément Bœsch <clement@stupeflix.com>
| * vaapi: Drop pointless debug outputDiego Biurrun2016-05-035-20/+0
| |
* | Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'Clément Bœsch2016-06-211-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * libopencore-amr: Fix ff_dlog()/av_log() invocationsDiego Biurrun2016-05-031-6/+8
| |
* | Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'Clément Bœsch2016-06-219-12/+14
|\ \ | |/ | | | | | | | | | | * commit '0f40c9098498ad90dbbd2380eb4269015e84bde4': Drop pointless assert.h #includes Merged-by: Clément Bœsch <clement@stupeflix.com>
| * Drop pointless assert.h #includesDiego Biurrun2016-05-0325-51/+3
| |
* | Merge commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2'Clément Bœsch2016-06-211-8/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegts: Validate the SL Packet Header ConfigurationLuca Barbato2016-05-031-0/+5
| | | | | | | | | | | | | | timeStampLength, OCRLength and AU_Length have well specified upper boundaries. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavc/mediacodecdec_h264: use ff_h264_decode_extradata to extract PPS/SPSMatthieu Bouron2016-06-211-111/+35
| | | | | | | | | | Fixes playback of HLS streams on MediaTek devices which requires PPS/SPS to be set in their respective csd-{0,1} buffers.
* | Merge commit '1982d0cc561912d685a0c2dbe58bc19f50bae231'Clément Bœsch2016-06-212-0/+136
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * fate: Add test for MTS2/MSS4Diego Biurrun2016-05-022-0/+132
| |
* | Merge commit '375cad096565b0796df2a307faae7619766f7c49'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * rtpdec_vp9: Support parsing the scalability structureMartin Storsjö2016-04-301-2/+58
| | | | | | | | | | | | | | | | We still only support one single layer though, but this allows receiving streams that have this structure present even for single layer streams. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_logMartin Storsjö2016-04-301-3/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b55e3633d3f60cf0f51269f25936409b79d2729e'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for ↵Martin Storsjö2016-04-302-2/+2
| | | | | | | | | | | | unimplemented features Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * rtpdec_vp9: Update header parsing to spec draft 02Martin Storsjö2016-04-301-22/+12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * rtpdec_vp9: Make sure to free the temp buffer on closeMartin Storsjö2016-04-301-0/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c26741332165a049717e6da84db13a24ee8edade'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * Revert "mmaldec: autodetect by default" since it breaks linking on systems ↵Janne Grunau2016-04-301-4/+3
| | | | | | | | | | | | without mmal libraries This reverts commit 33ac77e850efdfd0e8835950c3d947baffd4df45.
* | Merge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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>
| * mmaldec: autodetect by defaultwm42016-04-301-3/+4
| | | | | | | | | | | | It qualifies as a system library. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavc/mmaldec: reduce some diffs with Libav missed in previous skipped mergesClément Bœsch2016-06-211-14/+14
| |
* | Merge commit '74beead9bd596180bcac6108548fc0a86d8eb4ae'Clément Bœsch2016-06-212-3/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * mmaldec: limit internal bufferingwm42016-04-302-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses a new MMAL feature, which limits the number of extra frames that can be buffered within the decoder. VIDEO_MAX_NUM_CALLBACKS can be defined as positive or negative number. Positive numbers are absolute, and can lead to deadlocks if the user underestimates the number of required buffers. Negative numbers specify the number of extra buffers, e.g. -1 means no extra buffer, (-1-N) means N extra buffers. Set a gratuitous default of -11 (N=10). This is much lower than the firmware default, which appears to be 96. This is backwards compatible, but needs a symbol only present in newer firmware headers. (It's an enum item, so it requires a check in configure.) Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * mmaldec: print the MMAL format FourCC automaticallywm42016-04-301-3/+4
| | | | | | | | | | | | | | Slight simplification. The result is the same. Also, change the wording of the message as requested in patch review. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '84bba36846870c6269732351c022eeef094c6c83'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '84bba36846870c6269732351c022eeef094c6c83': configure: fix mmal build dependencies This commit is a noop, see 0badf4564a90ffa6f104b275277a6015a1d33905 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * configure: fix mmal build dependencieswm42016-04-301-6/+5
| | | | | | | | | | | | The mmal decoders do not depend on the software decoders. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ce589940c2cac936891e8bba275580d6efc41e8b'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * mmaldec: send only a single EOS packet on flushingwm42016-04-301-0/+2
| | | | | | | | | | | | | | | | Fixes apparent mmal_port_disable() freezes in ffmmal_stop_decoder() when calling ffmmal_decode() with flush semantics a large number of times in a row. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'Clément Bœsch2016-06-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d': mmaldec: correct package buffering accounting This commit is a noop, see a55fbfa4c4967068a9c37f041110ace9fb633d4e Merged-by: Clément Bœsch <clement@stupeflix.com>
View Lorry Controller Status