Skip to content

F
ffmpeg.wasm-core
Commit 868ac91c authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

frmdec: do not abuse ff_codec_get_id() 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent db1ba221
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
libavformat/frmdec.c
View file @ 868ac91c
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
* Megalux Frame demuxer * Megalux Frame demuxer
*/ */
#include "libavcodec/raw.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avformat.h" #include "avformat.h"
#include "riff.h"
static const AVCodecTag frm_pix_fmt_tags[] = { static const PixelFormatTag frm_pix_fmt_tags[] = {
{ AV_PIX_FMT_RGB555, 1 }, { AV_PIX_FMT_RGB555, 1 },
{ AV_PIX_FMT_RGB0, 2 }, { AV_PIX_FMT_RGB0, 2 },
{ AV_PIX_FMT_RGB24, 3 }, { AV_PIX_FMT_RGB24, 3 },
...@@ -61,7 +61,7 @@ static int frm_read_header(AVFormatContext *avctx) ...@@ -61,7 +61,7 @@ static int frm_read_header(AVFormatContext *avctx)
st->codec->codec_id = AV_CODEC_ID_RAWVIDEO; st->codec->codec_id = AV_CODEC_ID_RAWVIDEO;
avio_skip(pb, 3); avio_skip(pb, 3);
st->codec->pix_fmt = ff_codec_get_id(frm_pix_fmt_tags, avio_r8(pb)); st->codec->pix_fmt = avpriv_find_pix_fmt(frm_pix_fmt_tags, avio_r8(pb));
if (!st->codec->pix_fmt) if (!st->codec->pix_fmt)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment