Commit Graph

47 Commits

Author SHA1 Message Date
James Almer 22b6e1011c doc/libav-merge: add a line about the previous skipped merge 2019-02-20 13:51:19 -03:00
Paul B Mahol 042fc12344 doc/libav-merge: bitstream reader is now merged
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2018-08-30 11:50:23 +02:00
Paul B Mahol c116ba375e doc/libav-merge: remove resolved item
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2018-04-28 14:15:41 +02:00
James Almer 077fe9eb06 doc/libav-merge: remove line about libavutil atomics API
See 89b84cb18b.

Signed-off-by: James Almer <jamrial@gmail.com>
2018-01-05 22:09:39 -03:00
James Almer 5450972be4 doc/libav-merge: remove line about VP9 superframe parsing
It was addressed in a5679933c1,
0c162854c1 and
5a366f9770.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-12-15 14:39:06 -03:00
Mark Thompson 07e1bd7e2d doc/libav-merge: Remove VAAPI VP8 decode hwaccel merge note
Done in 9f00fa5369 and
40b75a943b.
2017-12-15 16:53:13 +00:00
James Almer bad51e9287 doc/libav-merge: add a line about the skipped HEVC MC arm functions
Signed-off-by: James Almer <jamrial@gmail.com>
2017-12-10 21:03:28 -03:00
James Almer ac36d0c97a doc/libav-merge: mention more skipped outdev removal commits
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-11 17:17:30 -03:00
James Almer e5233b1581 doc/libav-merge: mention skipped outdev removal commit
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-11 17:12:08 -03:00
James Almer 4b97435566 doc/libav-merge: mention skipped hlsenc commit
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-01 13:55:29 -03:00
James Almer 774295a3e0 doc/libav-merge: mention skipped or incomplete runtime alignment commits
Signed-off-by: James Almer <jamrial@gmail.com>
2017-09-27 23:58:20 -03:00
Steven Liu 44e9783ab9 doc/libav-merge: remove the hls merge TODO
This TODO is done.
See 5caaa3a49e

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Steven Liu <lq@onvideo.cn>
2017-08-04 22:18:22 +08:00
James Almer 5213c6d175 doc/libav-merge: remove lines about AVFrame crop fields 2017-05-26 11:22:23 -03:00
James Almer 94ec89eb67 doc/libav-merge: remove line about aac_adtstoasc
Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-24 20:28:01 -03:00
James Almer 602ac48720 doc/libav-merge: mention the skipped AVFrame crop fields usage commits 2017-05-11 14:03:41 -03:00
Michael Niedermayer 3c3d4ce4fd doc: fix bistream typo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-08 03:25:17 +02:00
James Almer 470ad23a55 doc/libav_merge: remove line about ADVANCED_PARSER
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>
2017-05-05 17:30:38 -03:00
Clément Bœsch d417e95af7 Merge commit 'fa1749dd34c55fb997c97dfc4da9383c9976ab91'
* 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>
2017-04-25 19:02:47 +02:00
James Almer 3f8d7342c3 doc/libav-merge: remove line about extract_extradata_bsf usage
It was addressed in b8f26779d6
2017-04-07 17:31:40 -03:00
Clément Bœsch ee161dac9d Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9'
* 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>
2017-04-03 20:38:28 +02:00
Clément Bœsch a3fc5f535a doc/libav-merge: document hlsenc encryption state 2017-04-01 18:21:34 +02:00
James Almer 6171f178e7 x86/hevc_add_res: merge last remaining changes from 3d65359832
See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html
2017-03-31 20:49:45 -03:00
James Almer b62a87591e doc/libav-merge: link to the relevant ml thread in the extract_extradata line 2017-03-31 20:35:16 -03:00
James Almer 183635b9e9 doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska 2017-03-31 15:33:48 -03:00
James Almer 0505a1d9c4 doc/libav-merge: remove line about AC3 fixed decoder speedup
It was addressed in commit 91ccd38c0b
2017-03-31 11:31:41 -03:00
Clément Bœsch 549045254c Fix all -Wformat warnings raised by DJGPP 2017-03-29 14:49:29 +02:00
Clément Bœsch 53dac6c23b Merge commit 'c454dfcff90f0ed39c7b0d4e85664986a8b4476c'
* 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>
2017-03-27 22:04:56 +02:00
Clément Bœsch 3d65359832 Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'
* commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b':
  hevc: x86: Add add_residual() SIMD optimizations

See a6af4bf64d

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>
2017-03-24 12:33:25 +01:00
James Almer 0f4abbd4ee doc/libav-merge: add a line about the extract_extradata commits 2017-03-23 19:49:09 -03:00
Clément Bœsch 947230837c Merge commit '112cee0241f5799edff0e4682b9e8639b046dc78'
* commit '112cee0241f5799edff0e4682b9e8639b046dc78':
  hevc: Add SSE2 and AVX IDCT

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 15:58:46 +01:00
Clément Bœsch d521258b19 Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'
* 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>
2017-03-23 11:14:13 +01:00
Clément Bœsch 9dc57688c8 lavc/mips: temporally disable ac3 downmix 2017-03-22 11:46:13 +01:00
Clément Bœsch ce10e4cb1f doc/libav-merge: create a special "extra changes" section 2017-03-22 11:43:00 +01:00
Clément Bœsch bb7cc5b5d9 Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'
* 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>
2017-03-21 14:54:07 +01:00
Clément Bœsch 9785b1e21b Merge commit '75d642a944d5579e4ef20ff3701422a64692afcf'
* 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>
2017-03-20 11:54:29 +01:00
Anton Khirnov 807a3b30d2 lavfi: add a QSV scaling filter
This merges libav commit ac7bfd6967,
which was previously skipped.

(cherry picked from commit ac7bfd6967)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2017-03-12 15:02:33 +00:00
Anton Khirnov 76e13bdeaa ffmpeg: restructure sending EOF to filters
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 a3a0230a98

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>
2017-03-03 08:45:43 +01:00
Clément Bœsch de2f9f4b71 doc/libav-merge: add unmerged hevc commits hashes 2017-01-30 12:03:30 +01:00
Hendrik Leppkes e3d9bd7102 doc/libav-merge: add skipped fixup commits to the list of missing changes 2016-11-13 22:34:01 +01:00
Hendrik Leppkes 53e116eeeb doc: update merge status for recent additions and skipped merges 2016-11-13 17:29:01 +01:00
Hendrik Leppkes 3c18188f9f doc/libav-merge: add a note for the skipped QSV functionality 2016-10-01 15:20:44 +02:00
Clément Bœsch 0fbd423905 doc/libav-merge: complete TODO section 2016-10-01 10:41:27 +02:00
Clément Bœsch bd9e425459 doc/libav-merge: change gmane link to a ffmpeg.org one 2016-09-25 19:38:27 +02:00
Clément Bœsch 95a7cbb09d doc: move out merge script to tools 2016-09-25 19:27:51 +02:00
Clément Bœsch 485f75b278 doc: remove codecpar mention in libav-merge.txt 2016-09-25 19:17:39 +02:00
Michael Niedermayer 360d3f3c18 doc&tools: Add murge script, for analyzing 3 way conflicts.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-22 18:54:03 +02:00
Clément Bœsch 2477775bf8 doc: add Libav merge document 2016-08-17 15:31:38 +02:00