diff options
| author | Luca Abeni <lucabe72@email.it> | 2006-08-02 09:48:05 +0000 |
|---|---|---|
| committer | Luca Abeni <lucabe72@email.it> | 2006-08-02 09:48:05 +0000 |
| commit | 20dd25adc3595c60c7215504a4df9db64e17dabc (patch) | |
| tree | 0a2356ad013ef9d8f9ad097aca46a68bc8741cd1 | |
| parent | e81e3ced6df0ca98cbc4dbefcee33e6a494eebcc (diff) | |
| download | ffmpeg-20dd25adc3595c60c7215504a4df9db64e17dabc.tar.gz | |
Do not set the codec's pixel format in the format's write_header()
Originally committed as revision 5887 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/gif.c | 6 | ||||
| -rwxr-xr-x | tests/regression.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/gif.c b/libavformat/gif.c index bef98d3ac4..f9a891ff57 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -339,8 +339,10 @@ static int gif_write_header(AVFormatContext *s) // rate = video_enc->time_base.den; } - /* XXX: is it allowed ? seems to work so far... */ - video_enc->pix_fmt = PIX_FMT_RGB24; + if (video_enc->pix_fmt != PIX_FMT_RGB24) { + av_log(s, AV_LOG_ERROR, "ERROR: gif only handles the rgb24 pixel format. Use -pix_fmt rgb24.\n"); + return AVERROR_IO; + } gif_image_write_header(pb, width, height, loop_count, NULL); diff --git a/tests/regression.sh b/tests/regression.sh index 9aa1563214..1d8c337450 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -691,7 +691,7 @@ do_ffmpeg_crc $file -f image2pipe -i $file # gif file=${outfile}libav.gif -do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file +do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -pix_fmt rgb24 $file #do_ffmpeg_crc $file -i $file # yuv4mpeg |