RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1' 

* commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1':
  msmpeg4: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-07 00:12:52 +01:00
parent 40e123bc67 1c6183233d
commit 89388cf60b
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegvideo.h
View File

@ -891,7 +891,7 @@ void ff_msmpeg4_encode_mb(MpegEncContext * s,
int ff_msmpeg4_decode_picture_header(MpegEncContext * s);
int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size);
int ff_msmpeg4_decode_init(AVCodecContext *avctx);
void ff_msmpeg4_encode_init(MpegEncContext *s);
int ff_msmpeg4_encode_init(MpegEncContext *s);
int ff_wmv2_decode_picture_header(MpegEncContext * s);
int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s);
void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr);

3
libavcodec/mpegvideo_enc.c
View File

@ -889,7 +889,8 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
if (CONFIG_H263_ENCODER && s->out_format == FMT_H263)
ff_h263_encode_init(s);
if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version)
ff_msmpeg4_encode_init(s);
if ((ret = ff_msmpeg4_encode_init(s)) < 0)
return ret;
if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
&& s->out_format == FMT_MPEG1)
ff_mpeg1_encode_init(s);

19
libavcodec/msmpeg4enc.c
View File

@ -45,11 +45,14 @@
static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];
/* build the table which associate a (x,y) motion vector to a vlc */
static av_cold void init_mv_table(MVTable *tab)
static av_cold int init_mv_table(MVTable *tab)
{
int i, x, y;
tab->table_mv_index = av_malloc(sizeof(uint16_t) * 4096);
if (!tab->table_mv_index)
return AVERROR(ENOMEM);
/* mark all entries as not used */
for(i=0;i<4096;i++)
tab->table_mv_index[i] = tab->n;
@ -59,6 +62,8 @@ static av_cold void init_mv_table(MVTable *tab)
y = tab->table_mvy[i];
tab->table_mv_index[(x << 6) | y] = i;
}
return 0;
}
void ff_msmpeg4_code012(PutBitContext *pb, int n)
@ -112,10 +117,10 @@ static int get_size_of_code(MpegEncContext * s, RLTable *rl, int last, int run,
return size;
}
av_cold void ff_msmpeg4_encode_init(MpegEncContext *s)
av_cold int ff_msmpeg4_encode_init(MpegEncContext *s)
{
static int init_done=0;
int i;
int i, ret;
ff_msmpeg4_common_init(s);
if(s->msmpeg4_version>=4){
@ -126,8 +131,10 @@ av_cold void ff_msmpeg4_encode_init(MpegEncContext *s)
if (!init_done) {
/* init various encoding tables */
init_done = 1;
init_mv_table(&ff_mv_tables[0]);
init_mv_table(&ff_mv_tables[1]);
if ((ret = init_mv_table(&ff_mv_tables[0])) < 0)
return ret;
if ((ret = init_mv_table(&ff_mv_tables[1])) < 0)
return ret;
for(i=0;i<NB_RL_TABLES;i++)
ff_init_rl(&ff_rl_table[i], ff_static_rl_table_store[i]);
@ -144,6 +151,8 @@ av_cold void ff_msmpeg4_encode_init(MpegEncContext *s)
}
}
}
return 0;
}
static void find_best_tables(MpegEncContext * s)