RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
84,220 Commits 36 Branches 392 Tags 309 MiB
Commit Graph

12 Commits

Author SHA1 Message Date
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