summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavc/mediacodec: rely on buffer flags to detect end of streamMatthieu Bouron2016-06-232-11/+9
|
* lavc/mediacodec: re-indent after previous commitMatthieu Bouron2016-06-231-12/+12
|
* lavc/mediacodec: discard 0-sized buffersMatthieu Bouron2016-06-231-0/+7
| | | | Their only purpose is to carry the end of stream flag.
* ffprobe: print stereo3d informationClément Bœsch2016-06-231-0/+5
| | | | | | | Based on 8e757716c61e0563a63829e30b02d5ba2a422ad6 See https://github.com/mpv-player/mpv/issues/1045 for mk3d elektranox.org samples.
* ffprobe: refactor pkt side data printingClément Bœsch2016-06-231-31/+32
|
* Merge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'Clément Bœsch2016-06-230-0/+0
|\ | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * avprobe: Print stereo3d informationVittorio Giovara2016-05-171-0/+12
| |
* | avcodec: remove libutvideo wrapper supportDerek Buitenhuis2016-06-239-647/+2
| | | | | | | | | | | | The 10-bit decoding support is available now in native decoder. Signed-off-by: Paul B Mahol <[email protected]>
* | avcodec/sheervideo: fix YbYr format decodingPaul B Mahol2016-06-231-4/+4
| | | | | | | | Signed-off-by: Paul B Mahol <[email protected]>
* | Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'Clément Bœsch2016-06-235-30/+57
|\| | | | | | | | | | | | | * commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd': stereo3d: Add API to get name from value or value from name Merged-by: Clément Bœsch <[email protected]>
| * stereo3d: Add API to get name from value or value from nameVittorio Giovara2016-05-175-30/+57
| | | | | | | | Use it in av_dump_format() instead of a huge switch case.
* | Merge commit 'd621b2f795684f7119057f986066060adbe84220'Clément Bœsch2016-06-231-26/+28
|\| | | | | | | | | | | | | * commit 'd621b2f795684f7119057f986066060adbe84220': lavf: Raw G.729 demuxer Merged-by: Clément Bœsch <[email protected]>
| * lavf: Raw G.729 demuxerVladimir Voroshilov2016-05-175-2/+110
| | | | | | | | Signed-off-by: Vittorio Giovara <[email protected]>
* | Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'Clément Bœsch2016-06-230-0/+0
|\| | | | | | | | | | | | | | | | | * commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7': fate: Update fate-lavf-ts after commit 393596f9d5 This commit is a noop, see c0ff42bf6468c7440568ec15c81edc52289f0c8a Merged-by: Clément Bœsch <[email protected]>
| * fate: Update fate-lavf-ts after commit 393596f9d5Martin Storsjö2016-05-171-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'Clément Bœsch2016-06-232-46/+47
|\| | | | | | | | | | | | | * commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8': tools: Port to codec parameters API Merged-by: Clément Bœsch <[email protected]>
| * tools: Port to codec parameters APIDiego Biurrun2016-05-172-46/+47
| |
* | avformat/mov: add more datatypes in metadata handlingDavid Murmann2016-06-231-2/+34
| | | | | | | | | | | | | | Implement variable sized big-endian integers, since these are found in files created by ARRI cameras. Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'Clément Bœsch2016-06-233-3/+5
|\| | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * mpegtsenc: stop impersonating ses in sdtFrancois Cartegnie2016-05-171-1/+3
| | | | | | | | | | | | | | Unless specified, users must use non registered range for network id Signed-off-by: Luca Barbato <[email protected]>
* | dshow: avoid duplicate NULL check before freerogerdpack2016-06-231-8/+4
| | | | | | | | | | Signed-off-by: rogerdpack <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | dshow: don't add two instances of same device to graphsrogerdpack2016-06-232-7/+32
| | | | | | | | | | Signed-off-by: rogerdpack <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | MAINTAINERS: Remove Linux / PowerPC maintainerMichael Niedermayer2016-06-231-1/+0
| | | | | | | | | | | | See: [FFmpeg-devel] PPC64: PowerPC Maintainer information is incorrect Signed-off-by: Michael Niedermayer <[email protected]>
* | fate: add apad testPetru Rares Sincraian2016-06-232-0/+270
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavc: fix previous mergeClément Bœsch2016-06-232-4/+5
| |
* | Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'Clément Bœsch2016-06-237-44/+74
|\| | | | | | | | | | | | | * commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c': Move VLC and RL_VLC_ELEM structure definitions to a separate header Merged-by: Clément Bœsch <[email protected]>
| * Move VLC and RL_VLC_ELEM structure definitions to a separate headerAlexandra Hájková2016-05-177-44/+74
| | | | | | | | | | | | | | Use the newly created vlc.h directly instead of including get_bits when needed. The VLC and RL_VLC_ELEM structures are independent from the bitreader. Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'Hendrik Leppkes2016-06-221-209/+115
|\| | | | | | | | | | | | | * commit 'b23613268c6b56a8f9de7859562d82b4b88353d9': avconv_dxva2: use the hwcontext API Merged-by: Hendrik Leppkes <[email protected]>
| * avconv_dxva2: use the hwcontext APIAnton Khirnov2016-05-171-193/+113
| |
* | hwcontext_dxva2: support P010 10-bit surfacesHendrik Leppkes2016-06-221-4/+18
| |
* | fate: add test for amergePetru Rares Sincraian2016-06-222-0/+140
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'Hendrik Leppkes2016-06-228-1/+376
|\| | | | | | | | | | | | | * commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8': hwcontext: add a dxva2 implementation Merged-by: Hendrik Leppkes <[email protected]>
| * hwcontext: add a dxva2 implementationAnton Khirnov2016-05-178-1/+376
| |
* | avformat/flacdec: Fix seeking close to EOFMichael Niedermayer2016-06-221-3/+6
| | | | | | | | | | | | Fixes Ticket5428 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/flac_parser: Raise threshold for detecting invalid dataMichael Niedermayer2016-06-221-2/+2
| | | | | | | | | | | | Fixes regression from Ticket5428 Signed-off-by: Michael Niedermayer <[email protected]>
* | lavc/get_bits: add a logging context to check_marker()Clément Bœsch2016-06-225-41/+43
| | | | | | | | Based on d338abb664febbc2c7266af7818aab1f12dbc161
* | Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'Clément Bœsch2016-06-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead ↵Alexandra Hájková2016-05-161-10/+10
| | | | | | | | | | | | of NULL Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'Clément Bœsch2016-06-220-0/+0
|\| | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * Move check_marker() from get_bits to mpeg4videodecAlexandra Hájková2016-05-162-9/+9
| | | | | | | | | | | | MPEG-4 is the only decoder which uses check_marker(). Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'Clément Bœsch2016-06-221-0/+6
|\| | | | | | | | | | | | | * commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3': lavc: mark the old audio/video encoding API as deprecated Merged-by: Clément Bœsch <[email protected]>
| * lavc: mark the old audio/video encoding API as deprecatedAnton Khirnov2016-05-161-0/+6
| |
* | Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'Clément Bœsch2016-06-220-0/+0
|\| | | | | | | | | | | | | | | | | * commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c': x86inc: Enable AVX emulation in additional cases This commit is a noop, see e428f3b30cebbc2beafb3ff2972dbf8b47bc4a70 Merged-by: Clément Bœsch <[email protected]>
| * x86inc: Enable AVX emulation in additional casesAnton Mitrofanov2016-05-161-8/+13
| | | | | | | | | | | | | | Allows emulation to work when dst is equal to src2 as long as the instruction is commutative, e.g. `addps m0, m1, m0`. Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'Clément Bœsch2016-06-220-0/+0
|\| | | | | | | | | | | | | | | | | * commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600': x86inc: Improve handling of %ifid with multi-token parameters This commit is a noop, see 4bd5583acea5d65a2f8fd8fcd5ab7b404af23f45 Merged-by: Clément Bœsch <[email protected]>
| * x86inc: Improve handling of %ifid with multi-token parametersAnton Mitrofanov2016-05-161-2/+2
| | | | | | | | | | | | | | | | The yasm/nasm preprocessor only checks the first token, which means that parameters such as `dword [rax]` are treated as identifiers, which is generally not what we want. Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f'Clément Bœsch2016-06-220-0/+0
|\| | | | | | | | | | | | | | | | | * commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f': x86inc: Fix AVX emulation of some instructions This commit is a noop, see 42be240ad6874fbc2b0e88a3ee133ece58d60692 Merged-by: Clément Bœsch <[email protected]>
| * x86inc: Fix AVX emulation of some instructionsAnton Mitrofanov2016-05-161-20/+24
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'Clément Bœsch2016-06-220-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc': x86inc: Fix AVX emulation of scalar float instructions This commit is a noop, see 8dd3ee9dddcaf1d538252d77dd2af3ea139f4f96 Merged-by: Clément Bœsch <[email protected]>
| * x86inc: Fix AVX emulation of scalar float instructionsHenrik Gramner2016-05-161-14/+14
| | | | | | | | | | | | | | Those instructions are not commutative since they only change the first element in the vector and leave the rest unmodified. Signed-off-by: Anton Khirnov <[email protected]>