virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
This broke mplayer

This reverts commit a18e04bcf9.
This commit is contained in:
Michael Niedermayer 2011-09-02 01:18:22 +02:00
parent e6ea4c715d
commit fea20d1ddc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mjpegdec.c
View File

@ -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"); av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n");
init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8); init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
if (ff_mjpeg_decode_dht(s)) { if (ff_mjpeg_decode_dht(s)) {
av_log(avctx, AV_LOG_ERROR, "mjpeg: error using external huffman table\n"); av_log(avctx, AV_LOG_ERROR, "mjpeg: error using external huffman table, switching back to internal\n");
return AVERROR_INVALIDDATA; build_basic_mjpeg_vlc(s);
} }
} }
if (avctx->extradata_size > 9 && if (avctx->extradata_size > 9 &&