diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 23:08:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 23:08:08 +0100 |
| commit | f7b041b11b0f1dcfe99918230b56859e6960b9f4 (patch) | |
| tree | e49ba8db5ac08182a38659581bde8789a0f993dd /libavcodec/imgconvert.c | |
| parent | d85c9b036e65afa05dcc8fbf37813ef4a05db1f3 (diff) | |
| parent | 7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08 (diff) | |
| download | ffmpeg-f7b041b11b0f1dcfe99918230b56859e6960b9f4.tar.gz | |
Merge commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08'
* commit '7d42fd6bb9df99a20cf2d0d0e3b166a83a649d08':
lavc: remove disabled FF_API_FIND_BEST_PIX_FMT cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 6c3bb368ec..cf3c9677f9 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -215,25 +215,6 @@ int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, return loss; } -#if FF_API_FIND_BEST_PIX_FMT -enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt, - int has_alpha, int *loss_ptr) -{ - enum AVPixelFormat dst_pix_fmt; - int i; - - if (loss_ptr) /* all losses count (for backward compatibility) */ - *loss_ptr = 0; - - dst_pix_fmt = AV_PIX_FMT_NONE; /* so first iteration doesn't have to be treated special */ - for(i = 0; i< FFMIN(AV_PIX_FMT_NB, 64); i++){ - if (pix_fmt_mask & (1ULL << i)) - dst_pix_fmt = avcodec_find_best_pix_fmt_of_2(dst_pix_fmt, i, src_pix_fmt, has_alpha, loss_ptr); - } - return dst_pix_fmt; -} -#endif /* FF_API_FIND_BEST_PIX_FMT */ - enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) { |