mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-29 16:23:10 +02:00
do not call (av_)abort()
Originally committed as revision 3543 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
cacf7199a1
commit
9fe5a7b831
@ -190,7 +190,7 @@ static int build_table(VLC *vlc, int table_nb_bits,
|
|||||||
#endif
|
#endif
|
||||||
if (table[j][1] /*bits*/ != 0) {
|
if (table[j][1] /*bits*/ != 0) {
|
||||||
av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
|
av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
|
||||||
av_abort();
|
return -1;
|
||||||
}
|
}
|
||||||
table[j][1] = n; //bits
|
table[j][1] = n; //bits
|
||||||
table[j][0] = i; //code
|
table[j][0] = i; //code
|
||||||
|
@ -466,7 +466,7 @@ static void compute_scale_factors(unsigned char scale_code[SBLIMIT],
|
|||||||
sf[1] = sf[2] = sf[0];
|
sf[1] = sf[2] = sf[0];
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
av_abort();
|
assert(0); //cant happen
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -726,7 +726,8 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
|||||||
bitrate = enc->bit_rate;
|
bitrate = enc->bit_rate;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
av_abort();
|
snprintf(buf, buf_size, "Invalid Codec type %d", enc->codec_type);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if (encode) {
|
if (encode) {
|
||||||
if (enc->flags & CODEC_FLAG_PASS1)
|
if (enc->flags & CODEC_FLAG_PASS1)
|
||||||
|
@ -136,7 +136,7 @@ const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
|
|||||||
|
|
||||||
if(s->encoding){
|
if(s->encoding){
|
||||||
av_log(s->avctx, AV_LOG_ERROR, "XVMC doesn't support encoding!!!\n");
|
av_log(s->avctx, AV_LOG_ERROR, "XVMC doesn't support encoding!!!\n");
|
||||||
av_abort();
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
//from MPV_decode_mb(),
|
//from MPV_decode_mb(),
|
||||||
|
Loading…
Reference in New Issue
Block a user