aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/frmdec.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-01-08 15:54:58 +0000
committerPaul B Mahol <onemda@gmail.com>2013-01-12 14:39:13 +0000
commit868ac91c8dbe1df8efa17a141fad0b02a144a7d6 (patch)
treeba69ae00d21c604e01e0f77a8af66b3a62a19197 /libavformat/frmdec.c
parentdb1ba2213f70ad958ba4ec961042ea5a9e52fc9f (diff)
downloadffmpeg-868ac91c8dbe1df8efa17a141fad0b02a144a7d6.tar.gz
frmdec: do not abuse ff_codec_get_id()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/frmdec.c')
-rw-r--r--libavformat/frmdec.c6
1 files changed, 3 insertions, 3 deletions
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;