[FFmpeg-cvslog] Move avpriv_find_pix_fmt() to utils.c

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 23 13:25:42 2014 +0100| [9ff0467566e971a61dbc2cc7920034a1412df8ee] | committer: Michael Niedermayer

Move avpriv_find_pix_fmt() to utils.c

Fixes build with --disable-everything

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 82a90e7764ad04afd3679e4e4e89d85c7e4d4b53)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ff0467566e971a61dbc2cc7920034a1412df8ee
---

 libavcodec/Makefile |    1 -
 libavcodec/rawdec.c |   11 -----------
 libavcodec/utils.c  |   12 ++++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6ff8a1c..b56ecd1 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 444cf8e..d187d23 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -83,17 +83,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 19df3cc..7ffe6c6 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);