Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested"

This broke mplayer

This reverts commit a18e04bcf9.
pull/2/head
Michael Niedermayer 13 years ago
parent e6ea4c715d
commit fea20d1ddc
  1. 4
      libavcodec/mjpegdec.c

@ -108,8 +108,8 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n");
init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
if (ff_mjpeg_decode_dht(s)) {
av_log(avctx, AV_LOG_ERROR, "mjpeg: error using external huffman table\n");
return AVERROR_INVALIDDATA;
av_log(avctx, AV_LOG_ERROR, "mjpeg: error using external huffman table, switching back to internal\n");
build_basic_mjpeg_vlc(s);
}
}
if (avctx->extradata_size > 9 &&

Loading…
Cancel
Save