diff options
| author | Matthew Hoops <clone2727@gmail.com> | 2011-11-14 20:08:50 -0500 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2011-11-18 10:54:44 +0200 |
| commit | ddf9b510e772fb723ba8cb487ca000dd91b3d1f7 (patch) | |
| tree | 9bde200a833841bb929db93ef68aa22ab6c358dc | |
| parent | 525c5b08fb835cad000810d6299964f300a17daa (diff) | |
| download | ffmpeg-ddf9b510e772fb723ba8cb487ca000dd91b3d1f7.tar.gz | |
segafilm: add support for raw videos
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/segafilm.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index d4e496582b..b75c8774ce 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -34,6 +34,7 @@ #define FDSC_TAG MKBETAG('F', 'D', 'S', 'C') #define STAB_TAG MKBETAG('S', 'T', 'A', 'B') #define CVID_TAG MKBETAG('c', 'v', 'i', 'd') +#define RAW_TAG MKBETAG('r', 'a', 'w', ' ') typedef struct { int stream; @@ -129,8 +130,11 @@ static int film_read_header(AVFormatContext *s, if (AV_RB32(&scratch[8]) == CVID_TAG) { film->video_type = CODEC_ID_CINEPAK; - } else + } else if (AV_RB32(&scratch[8]) == RAW_TAG) { + film->video_type = CODEC_ID_RAWVIDEO; + } else { film->video_type = CODEC_ID_NONE; + } /* initialize the decoder streams */ if (film->video_type) { @@ -143,6 +147,15 @@ static int film_read_header(AVFormatContext *s, st->codec->codec_tag = 0; /* no fourcc */ st->codec->width = AV_RB32(&scratch[16]); st->codec->height = AV_RB32(&scratch[12]); + + if (film->video_type == CODEC_ID_RAWVIDEO) { + if (scratch[20] == 24) { + st->codec->pix_fmt = PIX_FMT_RGB24; + } else { + av_log(s, AV_LOG_ERROR, "raw video is using unhandled %dbpp\n", scratch[20]); + return -1; + } + } } if (film->audio_type) { |