RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/huffyuv: dont depend on bitstream_bpp having a specific value for version>2 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-28 00:27:57 +01:00
parent c94ed2a729
commit 2a9c50798b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/huffyuv.c
View File

@ -58,7 +58,7 @@ av_cold int ff_huffyuv_alloc_temp(HYuvContext *s)
{
int i;
if (s->bitstream_bpp<24) {
if (s->bitstream_bpp<24 || s->version > 2) {
for (i=0; i<3; i++) {
s->temp[i]= av_malloc(2*s->width + 16);
if (!s->temp[i])

2
libavcodec/huffyuvenc.c
View File

@ -349,7 +349,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL);
}
if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN) {
if (s->bitstream_bpp >= 24 && s->predictor == MEDIAN && s->version <= 2) {
av_log(avctx, AV_LOG_ERROR,
"Error: RGB is incompatible with median predictor\n");
return AVERROR(EINVAL);