RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity

jv demuxer: calculate palette_size for each frame in read_header

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2011-03-12 13:31:26 +11:00 committed by Michael Niedermayer
parent fbe98aee20
commit 2f1084ca87
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/jvdec.c
View File

@ -31,7 +31,7 @@
typedef struct { typedef struct {
int audio_size; /** audio packet size (bytes) */ int audio_size; /** audio packet size (bytes) */
int video_size; /** video packet size (bytes) */ int video_size; /** video packet size (bytes) */
int palette; /** frame contains palette change */ int palette_size; /** palette size (bytes) */
int video_type; /** per-frame video compression type */ int video_type; /** per-frame video compression type */
} JVFrame; } JVFrame;
@ -113,7 +113,7 @@ static int read_header(AVFormatContext *s,
jvf->audio_size = avio_rl32(pb); jvf->audio_size = avio_rl32(pb);
jvf->video_size = avio_rl32(pb); jvf->video_size = avio_rl32(pb);
jvf->palette = avio_r8(pb); jvf->palette_size = avio_r8(pb) ? 768 : 0;
if (avio_r8(pb)) if (avio_r8(pb))
av_log(s, AV_LOG_WARNING, "unsupported audio codec\n"); av_log(s, AV_LOG_WARNING, "unsupported audio codec\n");
jvf->video_type = avio_r8(pb); jvf->video_type = avio_r8(pb);
@ -152,8 +152,8 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
} }
case JV_VIDEO: case JV_VIDEO:
jv->state++; jv->state++;
if (jvf->video_size || jvf->palette) { if (jvf->video_size || jvf->palette_size) {
int size = jvf->video_size + (jvf->palette ? 768 : 0); int size = jvf->video_size + jvf->palette_size;
if (av_new_packet(pkt, size + 5)) if (av_new_packet(pkt, size + 5))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -171,7 +171,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
} }
case JV_PADDING: case JV_PADDING:
avio_skip(pb, FFMAX(e->size - jvf->audio_size - jvf->video_size avio_skip(pb, FFMAX(e->size - jvf->audio_size - jvf->video_size
- (jvf->palette ? 768 : 0), 0)); - jvf->palette_size, 0));
jv->state = JV_AUDIO; jv->state = JV_AUDIO;
jv->pts++; jv->pts++;
} }