diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 13:25:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 13:25:42 +0100 |
| commit | 82a90e7764ad04afd3679e4e4e89d85c7e4d4b53 (patch) | |
| tree | 81d41c1f195e173b1cca9d78bf2dee13eb49be13 | |
| parent | 686e662676288f04337d1dffcd0edf8235c9c8bf (diff) | |
| download | ffmpeg-82a90e7764ad04afd3679e4e4e89d85c7e4d4b53.tar.gz | |
Move avpriv_find_pix_fmt() to utils.c
Fixes build with --disable-everything
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/rawdec.c | 11 | ||||
| -rw-r--r-- | libavcodec/utils.c | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8c4d292376..b7c33eb0fb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -26,7 +26,6 @@ OBJS = allcodecs.o \ options.o \ parser.o \ raw.o \ - rawdec.o \ resample.o \ resample2.o \ utils.o \ diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index f46ca6434d..007674ec38 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -89,17 +89,6 @@ static const PixelFormatTag pix_fmt_bps_mov[] = { { AV_PIX_FMT_NONE, 0 }, }; -enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, - unsigned int fourcc) -{ - while (tags->pix_fmt >= 0) { - if (tags->fourcc == fourcc) - return tags->pix_fmt; - tags++; - } - return AV_PIX_FMT_NONE; -} - #if LIBAVCODEC_VERSION_MAJOR < 55 enum AVPixelFormat ff_find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc) { diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 19df3cc748..7ffe6c6524 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -46,6 +46,7 @@ #include "thread.h" #include "frame_thread_encoder.h" #include "internal.h" +#include "raw.h" #include "bytestream.h" #include "version.h" #include <stdlib.h> @@ -1071,6 +1072,17 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, return 0; } +enum AVPixelFormat avpriv_find_pix_fmt(const PixelFormatTag *tags, + unsigned int fourcc) +{ + while (tags->pix_fmt >= 0) { + if (tags->fourcc == fourcc) + return tags->pix_fmt; + tags++; + } + return AV_PIX_FMT_NONE; +} + static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); |