From 868ac91c8dbe1df8efa17a141fad0b02a144a7d6 Mon Sep 17 00:00:00 2001
From: Paul B Mahol
Date: Tue, 8 Jan 2013 15:54:58 +0000
Subject: frmdec: do not abuse ff_codec_get_id()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavformat/frmdec.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libavformat/frmdec.c')

diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c
index 9c29842734..a6f19afcd4 100644
--- a/libavformat/frmdec.c
+++ b/libavformat/frmdec.c
@@ -24,11 +24,11 @@
  * Megalux Frame demuxer
  */
 
+#include "libavcodec/raw.h"
 #include "libavutil/intreadwrite.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_RGB0,   2 },
     { AV_PIX_FMT_RGB24,  3 },
@@ -61,7 +61,7 @@ static int frm_read_header(AVFormatContext *avctx)
     st->codec->codec_id   = AV_CODEC_ID_RAWVIDEO;
     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)
         return AVERROR_INVALIDDATA;
 
-- 
cgit v1.2.3