RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

Move avpriv_find_pix_fmt() to utils.c

Browse Source 
Fixes build with --disable-everything

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-23 13:25:42 +01:00
parent 686e662676
commit 82a90e7764
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/Makefile
View File

@ -26,7 +26,6 @@ OBJS = allcodecs.o \
options.o \ options.o \
parser.o \ parser.o \
raw.o \ raw.o \
rawdec.o \
resample.o \ resample.o \
resample2.o \ resample2.o \
utils.o \ utils.o \

11
libavcodec/rawdec.c
View File

@ -89,17 +89,6 @@ static const PixelFormatTag pix_fmt_bps_mov[] = {
{ AV_PIX_FMT_NONE, 0 }, { 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 #if LIBAVCODEC_VERSION_MAJOR < 55
enum AVPixelFormat ff_find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc) enum AVPixelFormat ff_find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc)
{ {

12
libavcodec/utils.c
View File

@ -46,6 +46,7 @@
#include "thread.h" #include "thread.h"
#include "frame_thread_encoder.h" #include "frame_thread_encoder.h"
#include "internal.h" #include "internal.h"
#include "raw.h"
#include "bytestream.h" #include "bytestream.h"
#include "version.h" #include "version.h"
#include <stdlib.h> #include <stdlib.h>
@ -1071,6 +1072,17 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2,
return 0; 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) static int is_hwaccel_pix_fmt(enum AVPixelFormat pix_fmt)
{ {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);