summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
Commit message (Collapse)AuthorAge
* doc/libav-merge: add a line about the previous skipped mergeJames Almer2019-02-20
|
* doc/libav-merge: bitstream reader is now mergedPaul B Mahol2018-08-30
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/libav-merge: remove resolved itemPaul B Mahol2018-04-28
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/libav-merge: remove line about libavutil atomics APIJames Almer2018-01-05
| | | | | | See 89b84cb18b54d3af281643bcad8bba365a702e96. Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: remove line about VP9 superframe parsingJames Almer2017-12-15
| | | | | | | | It was addressed in a5679933c1b8b6bef5c5c3eb7c70d06c695066cf, 0c162854c1fa2a1e43ce5588b67842675f45e3c7 and 5a366f9770dd7b02b0721b2857d6baa96acdb0af. Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: Remove VAAPI VP8 decode hwaccel merge noteMark Thompson2017-12-15
| | | | | Done in 9f00fa536938130e3c7ad2640a61795770d419a1 and 40b75a943bcb6a4af00c44ef6e52cbfc3e6580d8.
* doc/libav-merge: add a line about the skipped HEVC MC arm functionsJames Almer2017-12-10
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: mention more skipped outdev removal commitsJames Almer2017-11-11
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: mention skipped outdev removal commitJames Almer2017-11-11
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: mention skipped hlsenc commitJames Almer2017-11-01
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: mention skipped or incomplete runtime alignment commitsJames Almer2017-09-27
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: remove the hls merge TODOSteven Liu2017-08-04
| | | | | | | | This TODO is done. See 5caaa3a49e76b084ff8a9840d541bad64d96d7f7 Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Steven Liu <lq@onvideo.cn>
* doc/libav-merge: remove lines about AVFrame crop fieldsJames Almer2017-05-26
|
* doc/libav-merge: remove line about aac_adtstoascJames Almer2017-05-24
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* doc/libav-merge: mention the skipped AVFrame crop fields usage commitsJames Almer2017-05-11
|
* doc: fix bistream typoMichael Niedermayer2017-05-08
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/libav_merge: remove line about ADVANCED_PARSERJames Almer2017-05-05
| | | | | | | | It's been addressed. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Aaron Levinson <alevinsn@aracnet.com> Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit 'fa1749dd34c55fb997c97dfc4da9383c9976ab91'Clément Bœsch2017-04-25
| | | | | | | | | | | | | | * commit 'fa1749dd34c55fb997c97dfc4da9383c9976ab91': vp9: split superframes in the filtering stage before actual decoding This commit is a noop. 2017-04-24 20:45:04 @ubitux BBB: btw, do you think you can get the bsf thing this week or we should skip it to give you more time and go on with the merges? 2017-04-24 20:45:20 @BBB I’m not sure I’ll finish it that soon 2017-04-24 20:45:26 @BBB I’d skip it and leave it for later 2017-04-24 20:45:35 @BBB I’ll do it, I promise, but I Can’t guarantee it’ll be done by $date Merged-by: Clément Bœsch <u@pkh.me>
* doc/libav-merge: remove line about extract_extradata_bsf usageJames Almer2017-04-07
| | | | It was addressed in b8f26779d615dfb466e90627323b1a4e40639f76
* Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'Clément Bœsch2017-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9': (35 commits) qdm2: Convert to the new bitstream reader qcelp: Convert to the new bitstream reader pcx: Convert to the new bitstream reader opus: Convert to the new bitstream reader nellymoser: Convert to the new bitstream reader jvdec: Convert to the new bitstream reader hqx: Convert to the new bitstream header hq_hqa: Convert to the new bitstream reader gsm: Convert to the new bitstream reader g72x: Convert to the new bitstream reader g2meet: Convert to the new bitstream reader fraps: Convert to the new bitstream reader flashsv: Convert to the new bitstream reader faxcompr: Convert to the new bitstream reader exr: Convert to the new bitstream reader escape130: Convert to the new bitstream reader escape124: Convert to the new bitstream reader dvdsubdec: Convert to the new bitstream reader dss_sp: Convert to the new bitstream reader cook: Convert to the new bitstream reader ... This merge is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: Clément Bœsch <u@pkh.me>
* doc/libav-merge: document hlsenc encryption stateClément Bœsch2017-04-01
|
* x86/hevc_add_res: merge last remaining changes from ↵James Almer2017-03-31
| | | | | | 3d6535983282bea542dac2e568ae50da5796be34 See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html
* doc/libav-merge: link to the relevant ml thread in the extract_extradata lineJames Almer2017-03-31
|
* doc/libav-merge: mention aac_adtstoasc extradata update fix for matroskaJames Almer2017-03-31
|
* doc/libav-merge: remove line about AC3 fixed decoder speedupJames Almer2017-03-31
| | | | It was addressed in commit 91ccd38c0befb17d788c1621d1d4362dc1c40bd6
* Fix all -Wformat warnings raised by DJGPPClément Bœsch2017-03-29
|
* Merge commit 'c454dfcff90f0ed39c7b0d4e85664986a8b4476c'Clément Bœsch2017-03-27
| | | | | | | | | | * commit 'c454dfcff90f0ed39c7b0d4e85664986a8b4476c': Use ISO C printf conversion specifiers where appropriate This commit is a noop, an equivalent patch is currently under review on the mailing-list: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209239.html Merged-by: Clément Bœsch <u@pkh.me>
* Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'Clément Bœsch2017-03-24
| | | | | | | | | | | | | | | * commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b': hevc: x86: Add add_residual() SIMD optimizations See a6af4bf64dae46356a5f91537a1c8c5f86456b37 This merge is only cosmetics (renames, space shuffling, etc). The functionnal changes in the ASM are *not* merged: - unrolling with %rep is kept - ADD_RES_MMX_4_8 is left untouched: this needs investigation Merged-by: Clément Bœsch <u@pkh.me>
* doc/libav-merge: add a line about the extract_extradata commitsJames Almer2017-03-23
|
* Merge commit '112cee0241f5799edff0e4682b9e8639b046dc78'Clément Bœsch2017-03-23
| | | | | | | * commit '112cee0241f5799edff0e4682b9e8639b046dc78': hevc: Add SSE2 and AVX IDCT Merged-by: Clément Bœsch <u@pkh.me>
* Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'Clément Bœsch2017-03-23
| | | | | | | | | | | | * commit '5cc0057f4910c8c72421b812c8f337ef6c43696c': lavu: remove the custom atomic API This commit is a noop. The removal is postponed until all usages in FFmpeg are dropped as well. A patchset is on discussion on the mailing-list: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html Merged-by: Clément Bœsch <u@pkh.me>
* lavc/mips: temporally disable ac3 downmixClément Bœsch2017-03-22
|
* doc/libav-merge: create a special "extra changes" sectionClément Bœsch2017-03-22
|
* Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'Clément Bœsch2017-03-21
| | | | | | | | | | * commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb': examples/output: switch to the new encoding API This commit is a noop, our examples are different. Still, we need to update them to the new API, so doc/libav-merge.txt is updated. Merged-by: Clément Bœsch <u@pkh.me>
* Merge commit '75d642a944d5579e4ef20ff3701422a64692afcf'Clément Bœsch2017-03-20
| | | | | | | | | | | | | * commit '75d642a944d5579e4ef20ff3701422a64692afcf': vaapi_vp8: Explicitly include libva vp8 decode header vaapi_decode: Ignore the profile when not useful lavc/vaapi: Add VP8 decode hwaccel vp8: Add hwaccel hooks This merge is a noop as these commits are already under review on the mailing list. doc/libav-merge.txt is updated to track its progress. Merged-by: Clément Bœsch <u@pkh.me>
* lavfi: add a QSV scaling filterAnton Khirnov2017-03-12
| | | | | | | | This merges libav commit ac7bfd69678f3966e38debdb27f4bde94dc0345c, which was previously skipped. (cherry picked from commit ac7bfd69678f3966e38debdb27f4bde94dc0345c) Signed-off-by: Mark Thompson <sw@jkqxz.net>
* ffmpeg: restructure sending EOF to filtersAnton Khirnov2017-03-03
| | | | | | | | | | | | | | | | | | Be more careful when an input stream encounters EOF when its filtergraph has not been configured yet. The current code would immediately mark the corresponding output streams as finished, while there may still be buffered frames waiting for frames to appear on other filtergraph inputs. This should fix the random FATE failures for complex filtergraph tests after a3a0230a9870b9018dc7415ae5872784d524cfe5 This merges Libav commit 94ebf55. It was previously skipped. This is the last filter init related Libav commit that was skipped, so this also removes the commits from doc/libav-merge.txt. Signed-off-by: wm4 <nfxjfg@googlemail.com>
* doc/libav-merge: add unmerged hevc commits hashesClément Bœsch2017-01-30
|
* doc/libav-merge: add skipped fixup commits to the list of missing changesHendrik Leppkes2016-11-13
|
* doc: update merge status for recent additions and skipped mergesHendrik Leppkes2016-11-13
|
* doc/libav-merge: add a note for the skipped QSV functionalityHendrik Leppkes2016-10-01
|
* doc/libav-merge: complete TODO sectionClément Bœsch2016-10-01
|
* doc/libav-merge: change gmane link to a ffmpeg.org oneClément Bœsch2016-09-25
|
* doc: move out merge script to toolsClément Bœsch2016-09-25
|
* doc: remove codecpar mention in libav-merge.txtClément Bœsch2016-09-25
|
* doc&tools: Add murge script, for analyzing 3 way conflicts.Michael Niedermayer2016-08-22
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc: add Libav merge documentClément Bœsch2016-08-17
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 11:55:40 +0000