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

mpegvideo: Drop err_recognition

Browse Source 
It is just a duplicate of an AVCodecContext member so use it instead.
This commit is contained in:
Vittorio Giovara 2015-04-27 19:13:27 +01:00
parent 848e86f74d
commit 9c1db92ad3
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h263dec.c
View File

@ -340,7 +340,7 @@ static int decode_slice(MpegEncContext *s)
/* buggy padding but the frame should still end approximately at
* the bitstream end */
if ((s->workaround_bugs & FF_BUG_NO_PADDING) &&
(s->err_recognition & AV_EF_BUFFER))
(s->avctx->err_recognition & AV_EF_BUFFER))
max_extra += 48;
else if ((s->workaround_bugs & FF_BUG_NO_PADDING))
max_extra += 256 * 256 * 256 * 64;

2
libavcodec/ituh263dec.c
View File

@ -481,7 +481,7 @@ static int h263_decode_block(MpegEncContext * s, int16_t * block,
level = get_bits(&s->gb, 8);
if((level&0x7F) == 0){
av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y);
if(s->err_recognition & AV_EF_BITSTREAM)
if (s->avctx->err_recognition & AV_EF_BITSTREAM)
return -1;
}
if (level == 255)

2
libavcodec/mpeg4video.h
View File

@ -223,7 +223,7 @@ static inline int ff_mpeg4_pred_dc(MpegEncContext *s, int n, int level,
} else {
level += pred;
ret = level;
if (s->err_recognition & AV_EF_BITSTREAM) {
if (s->avctx->err_recognition & AV_EF_BITSTREAM) {
if (level < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"dc<0 at %dx%d\n", s->mb_x, s->mb_y);

4
libavcodec/mpeg4videodec.c
View File

@ -563,7 +563,7 @@ static inline int mpeg4_decode_dc(MpegEncContext *s, int n, int *dir_ptr)
if (code > 8) {
if (get_bits1(&s->gb) == 0) { /* marker */
if (s->err_recognition & AV_EF_BITSTREAM) {
if (s->avctx->err_recognition & AV_EF_BITSTREAM) {
av_log(s->avctx, AV_LOG_ERROR, "dc marker bit missing\n");
return -1;
}
@ -1099,7 +1099,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block,
level = level * qmul - qadd;
if ((unsigned)(level + 2048) > 4095) {
if (s->err_recognition & AV_EF_BITSTREAM) {
if (s->avctx->err_recognition & AV_EF_BITSTREAM) {
if (level > 2560 || level < -2560) {
av_log(s->avctx, AV_LOG_ERROR,
"|level| overflow in 3. esc, qp=%d\n",

2
libavcodec/mpegvideo.c
View File

@ -1858,8 +1858,6 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
}
}
s->err_recognition = avctx->err_recognition;
/* set dequantizer, we can't do it during init as
* it might change for mpeg4 and we can't do it in the header
* decode as init is not called for mpeg4 there yet */

1
libavcodec/mpegvideo.h
View File

@ -474,7 +474,6 @@ typedef struct MpegEncContext {
GetBitContext last_resync_gb; ///< used to search for the next resync marker
int mb_num_left; ///< number of MBs left in this video packet (for partitioned Slices only)
int next_p_frame_damaged; ///< set if the next p frame is damaged, to avoid showing trashed b frames
int err_recognition;
ParseContext parse_context;

4
libavcodec/msmpeg4dec.c
View File

@ -833,7 +833,9 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block,
i-= 192;
if(i&(~63)){
const int left= get_bits_left(&s->gb);
if(((i+192 == 64 && level/qmul==-1) || !(s->err_recognition&AV_EF_BITSTREAM)) && left>=0){
if (((i + 192 == 64 && level / qmul == -1) ||
!(s->avctx->err_recognition & AV_EF_BITSTREAM)) &&
left >= 0) {
av_log(s->avctx, AV_LOG_ERROR, "ignoring overflow at %d %d\n", s->mb_x, s->mb_y);
break;
}else{