diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 16:03:57 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 16:03:57 +0000 |
| commit | 10424024a16a7646169b9c9008c5f7b77cbc2211 (patch) | |
| tree | ea852976be3a8b8d0cd3d57bc1beb918b89991d0 /doc | |
| parent | 6992276acaaee32b33bd5f6e2f0d89588c4ae59a (diff) | |
| parent | b3dd30db0b2d857147fc0e1461a00bd6172a26a3 (diff) | |
| download | ffmpeg-streaming-10424024a16a7646169b9c9008c5f7b77cbc2211.zip ffmpeg-streaming-10424024a16a7646169b9c9008c5f7b77cbc2211.tar.gz | |
Merge commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3'
* commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3':
lavfi: pass the hw frames context through the filter chain
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | doc/filters.texi | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 5af5ab1..3c18454 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-xx-xx - lavfi 6.36.0 - avfilter.h + xxxxxxx avfilter.h - Add AVFilterLink.hw_frames_ctx. + xxxxxxx buffersrc.h - Add AVBufferSrcParameters and functions for handling it. + 2016-02-xx - xxxxxxx - lavc 57.25.100 Add AV_PKT_DATA_MPEGTS_STREAM_ID for exporting the MPEGTS stream ID. diff --git a/doc/filters.texi b/doc/filters.texi index aca7663..32042d0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -13457,6 +13457,10 @@ The sample (pixel) aspect ratio of the input video. Specify the optional parameters to be used for the scale filter which is automatically inserted when an input change is detected in the input size or format. + +@item hw_frames_ctx +When using a hardware pixel format, this should be a reference to an +AVHWFramesContext describing input frames. @end table For example: |
