diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-02 01:18:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-02 01:18:22 +0200 |
| commit | fea20d1ddc7bd5b059cae0a4a3c49c804eb4d7cb (patch) | |
| tree | cae0d20eef1e542491d4f0409a558da96935da68 | |
| parent | e6ea4c715db18b078537b784200e96c594328e0d (diff) | |
| download | ffmpeg-fea20d1ddc7bd5b059cae0a4a3c49c804eb4d7cb.tar.gz | |
Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested"
This broke mplayer
This reverts commit a18e04bcf989a9d7f5629c573f9d70f8a020c7a7.
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 4baacab733..cb0c692e6f 100644 --- a/libavcodec/mjpegdec.c +++ b/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 && |