diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-21 14:51:38 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-21 14:54:07 +0100 |
| commit | bb7cc5b5d928cbc948881f4f9b8b055129fe0f0b (patch) | |
| tree | 194a24bba3481dcc502ad589b1a64a912de95a25 /doc | |
| parent | 5dfe343d96dcd2159cb9242304f1336cb0176d11 (diff) | |
| parent | 67d28f4a0fbb52d0734ca3682b85035e96d294fb (diff) | |
| download | ffmpeg-bb7cc5b5d928cbc948881f4f9b8b055129fe0f0b.tar.gz | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/libav-merge.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 7a82b7ba41..e94a749770 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -95,6 +95,7 @@ Stuff that didn't reach the codebase: - 0cef06df0 checkasm: add HEVC MC tests - e7078e842 hevcdsp: add x86 SIMD for MC - VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348) +- Switching examples to the new encode/decode API (see 67d28f4a0f) Collateral damage that needs work locally: ------------------------------------------ |