RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
85,868 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

23 Commits

Author SHA1 Message Date
Clément Bœsch 47d8410dac Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d' 
* commit 'a1d9de304fe63614e3aa8117fef17491fa80093d':
  Fix some mismatches between function parameter and doxygen parameter names.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 20:41:16 +02:00
Clément Bœsch 4cda23f1f1 Merge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0' 
* commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0':
  hwcontext: Hardware frame mapping

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:36:37 +02:00
Jun Zhao 9365dfcbf6 hwcontext: fix comments for av_hwdevice_ctx_alloc() 
fix the wrong comments for av_hwdevice_ctx_alloc()

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-22 00:58:42 +00:00
Diego Biurrun a1d9de304f Fix some mismatches between function parameter and doxygen parameter names. 2016-11-21 14:29:10 +01:00
Hendrik Leppkes 72c38dd66e Merge commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498' 
* commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498':
  hwcontext: clarify the behaviour of transfer_data() for cropped frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-11-13 22:35:04 +01:00
Mark Thompson d06aa24ba5 hwcontext: Hardware frame mapping 
Adds the new av_hwframe_map() function, which allows mapping between
hardware frames and normal memory, along with internal support for
implementing it.

Also adds av_hwframe_ctx_create_derived(), for creating a hardware
frames context associated with one device using frames mapped from
another by some hardware-specific means.
 2016-11-03 23:49:01 +00:00
James Almer eba0414768 Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da' 
* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
  hwcontext: add a QSV implementation

Conflicts:
    doc/APIchanges
    libavutil/version.h

Merged-by: James Almer <jamrial@gmail.com>
 2016-09-28 13:30:27 -03:00
Anton Khirnov 5fcae3b3f9 hwcontext: clarify the behaviour of transfer_data() for cropped frames 2016-06-28 08:30:59 +02:00
Hendrik Leppkes 481f320aa3 Merge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d' 
* commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d':
  hwcontext: add a function for opening devices

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-06-26 15:23:24 +02:00
Hendrik Leppkes 3689efea3d Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8' 
* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
  hwcontext: add a dxva2 implementation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-06-22 22:38:49 +02:00
Clément Bœsch 8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Anton Khirnov 59e7361cc7 hwcontext: add a QSV implementation 2016-06-21 19:53:37 +02:00
Anton Khirnov 1c9e8616c5 hwcontext: add a function for opening devices 2016-05-26 15:40:32 +02:00
Anton Khirnov c46db38cde hwcontext: add a dxva2 implementation 2016-05-17 09:11:25 +02:00
Vittorio Giovara 41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Derek Buitenhuis 28abb216cb Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4' 
* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
  lavu: VAAPI hwcontext implementation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-14 13:49:55 +01:00
Derek Buitenhuis afccfaf26a Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09' 
* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
  lavu: add a way to query hwcontext frame constraints

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-14 13:33:37 +01:00
Mark Thompson 551c6775ab lavu: VAAPI hwcontext implementation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-03-19 15:40:22 +01:00
Mark Thompson b1f01e85a9 lavu: add a way to query hwcontext frame constraints 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-03-19 15:38:00 +01:00
Derek Buitenhuis 6992276aca Merge commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073' 
* commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073':
  hwcontext: add a CUDA implementation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 15:23:16 +00:00
Derek Buitenhuis 1a708780f3 Merge commit '89923e418b494e337683442ab896d754bc07341a' 
* commit '89923e418b494e337683442ab896d754bc07341a':
  lavu: add a framework for handling hwaccel frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-17 16:12:25 +00:00
Anton Khirnov ad884d1002 hwcontext: add a CUDA implementation 2016-02-14 22:08:33 +01:00
Anton Khirnov 89923e418b lavu: add a framework for handling hwaccel frames 2016-02-14 21:36:59 +01:00