summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | lavf/img2dec: add pnm pipe demuxersClément Bœsch2016-06-22
| |
* | avformat/utils: Use internal->avctx for bitrate in ↵Michael Niedermayer2016-06-22
| | | | | | | | | | | | | | | | | | | | 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>
* | avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()Michael Niedermayer2016-06-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swr: fix time.h includeClément Bœsch2016-06-22
| |
* | Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'Clément Bœsch2016-06-22
|\| | | | | | | | | | | | | * commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196': tests: Move all test programs to a subdirectory Merged-by: Clément Bœsch <clement@stupeflix.com>
| * tests: Move all test programs to a subdirectoryDiego Biurrun2016-05-13
| |
* | libavformat/matroskaenc: omit segment UID for webmMichael Bradshaw2016-06-22
| | | | | | | | | | | | | | | | 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>
* | Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'Clément Bœsch2016-06-22
|\| | | | | | | | | | | | | * commit '257f00ec1ab06a2a161f535036c6512f3fc8e801': Split global .gitignore file into per-directory files Merged-by: Clément Bœsch <clement@stupeflix.com>
| * Split global .gitignore file into per-directory filesDiego Biurrun2016-05-13
| |
* | lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guardClément Bœsch2016-06-22
| |
* | lavc/error_resilience: remove unused skip_last_mv labelClément Bœsch2016-06-22
| | | | | | | | Unused since a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886
* | Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'Clément Bœsch2016-06-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add some more deprecation guardsDiego Biurrun2016-05-11
| | | | | | | | Avoids unused function/label/variable warnings after the next version bump.
* | lavc/videotoolbox: fix avcC extradata creationMatthieu Bouron2016-06-22
| | | | | | | | | | | | | | | | | | | | Fixes properly ticket #5638. Since 772ad7142dff590c7bb30370acf5d3c9a8fb512b PPS and SPS contain the nal type byte. This reverts commit b8d754c5d0a2e99022c27bd1159ea3f597f67452. This reverts commit 8e47a99f576da10b2a36e33b6b9acbf1c2da7485.
* | avformat/flvdec: Do not check last size if it could not be read due to EOFMichael Niedermayer2016-06-22
| | | | | | | | | | Fixes part of Ticket5648 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/flvdec: Also print sum_flv_tag_size on size mismatchesMichael Niedermayer2016-06-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/flvdec: Accept last size if its off by 1Michael Niedermayer2016-06-22
| | | | | | | | | | | | Fixes part of Ticket5648 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376': Reduce the scope of some variables Merged-by: Clément Bœsch <u@pkh.me>
| * Reduce the scope of some variablesDiego Biurrun2016-05-11
| | | | | | | | | | This avoids unused variable warnings after the next version bump. Also drop a trace level av_log() call that is in the way.
* | Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit 'bc2a32969eb4db17677971def5ad5b936d9d1648': rtsp: Parse SSRC attributes in the SDP Merged-by: Clément Bœsch <u@pkh.me>
| * rtsp: Parse SSRC attributes in the SDPMartin Storsjö2016-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | When feeding input RTP packets to the depacketizer via custom IO, it needs to pick the right stream using the payload type for RTP packets, and using the SSRC for RTCP packets. If the first packet is an RTCP packet, we don't (currently) know the SSRC yet and thus can't pick the right RTP depacketizer to handle it. By parsing the SSRC attribute in the SDP, we can map initial RTCP packets to the right stream. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a': rtpdec: Always check if we have the next packet queued Merged-by: Clément Bœsch <u@pkh.me>
| * rtpdec: Always check if we have the next packet queuedMartin Storsjö2016-05-11
| | | | | | | | | | | | | | | | | | | | It doesn't matter what the actual reason for not returning an AVPacket was - if we didn't return any packet and we have the next one queued, parse it immediately. (rtp_parse_queued_packet always consumes a queued packet if one exists, so there's no risk for infinite loops.) Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '0c1d66a07917602303f129f5a5651faeec2415d5': avconv_vaapi: fix double-free with some unsupported streams Merged-by: Clément Bœsch <u@pkh.me>
| * avconv_vaapi: fix double-free with some unsupported streamsMark Thompson2016-05-10
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '885a9d6087315a85d98f7e89656ef01dc7104c4c': pgssub: Fix subpicture colorspace and range See 9779b6262471d553c1ed811ff7312564e39d8adf Merged-by: Clément Bœsch <u@pkh.me>
| * pgssub: Fix subpicture colorspace and rangeJan Ekström2016-05-10
| | | | | | | | | | | | | | | | | | Widen the values from limited to full range and use BT.709 where it should be used according to the video resolution: SD is BT.601, HD is BT.709 Default to BT.709 due to most observed HDMV content being HD.
* | Merge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '1f77e634bb838f71ff21923b5e9fe3104c831c52': colorspace: Add support for BT709 See 9779b6262471d553c1ed811ff7312564e39d8adf Merged-by: Clément Bœsch <u@pkh.me>
| * colorspace: Add support for BT709Jan Ekström2016-05-10
| | | | | | | | | | | | BT.709 coefficients were gathered from the first two parts of BT.709 to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2). They were additionally confirmed by manually calculating values.
* | Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | * commit '283226e11ccf50a71d25d150fbbf1743f74c6c49': simple_idct_template: Fix strict aliasing violation See 5df703aa1b03814e9cd216ab703501481166b3bb Merged-by: Clément Bœsch <u@pkh.me>
| * simple_idct_template: Fix strict aliasing violationMichael Niedermayer2016-05-10
| | | | | | | | | | | | | | This fixes fate-wmv8-intrax8 in certain configurations, e.g. gcc 4.4. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92': avio: Remove a leftover comment Merged-by: Clément Bœsch <u@pkh.me>
| * avio: Remove a leftover commentMartin Storsjö2016-05-06
| | | | | | | | | | | | | | 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-21
|\| | | | | | | | | | | | | * 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-05
| |
* | Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '1f1ad8ace040a08edc2646ff638ca42a8828779f': configure: Document --enable-libfontconfig Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Document --enable-libfontconfigDiego Biurrun2016-05-05
| |
* | Merge commit 'def03d14687b9d089950ba8e45083e666de4eb68'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * 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-04
| |
* | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/mpegts: include stream type for aacAman Gupta2016-06-21
| | | | | | | | | | | | | | | | 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-21
|\| | | | | | | | | | | | | * 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-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | | | * 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-03
| |
* | Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6': vaapi: Drop pointless debug output Merged-by: Clément Bœsch <clement@stupeflix.com>
| * vaapi: Drop pointless debug outputDiego Biurrun2016-05-03
| |
* | Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-03
| |