diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-02 00:21:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 00:21:32 +0200 |
| commit | 69d83c8fbe47b89d1d14f75ee99e638cbfb5dc31 (patch) | |
| tree | ce4b486ac8e13e1f5a8a918e532826c3ae09415d /media/ffvpx/libavcodec/imgconvert.c | |
| parent | 8e8fcee4a55de171303ebe526d3cf051522111bf (diff) | |
| parent | 41ccd52bfd7f3604d3ad3917af5f030994e13762 (diff) | |
| download | UXP-69d83c8fbe47b89d1d14f75ee99e638cbfb5dc31.tar UXP-69d83c8fbe47b89d1d14f75ee99e638cbfb5dc31.tar.gz UXP-69d83c8fbe47b89d1d14f75ee99e638cbfb5dc31.tar.lz UXP-69d83c8fbe47b89d1d14f75ee99e638cbfb5dc31.tar.xz UXP-69d83c8fbe47b89d1d14f75ee99e638cbfb5dc31.zip | |
Merge pull request #806 from trav90/ffvpx-resync
Update ffvpx code to 4.0.2 (take 2)
Diffstat (limited to 'media/ffvpx/libavcodec/imgconvert.c')
| -rw-r--r-- | media/ffvpx/libavcodec/imgconvert.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/ffvpx/libavcodec/imgconvert.c b/media/ffvpx/libavcodec/imgconvert.c index 1547f1896..1fd636c83 100644 --- a/media/ffvpx/libavcodec/imgconvert.c +++ b/media/ffvpx/libavcodec/imgconvert.c @@ -69,10 +69,15 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p int i; enum AVPixelFormat best = AV_PIX_FMT_NONE; + int loss; - for(i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) - best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, loss_ptr); + for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) { + loss = loss_ptr ? *loss_ptr : 0; + best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, &loss); + } + if (loss_ptr) + *loss_ptr = loss; return best; } |