highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avconv: prevent invalid reads in transcode_init()

Browse Source
This commit is contained in:
Anton Khirnov 2012-08-05 08:30:24 +02:00
parent 57d2422559
commit a5fd7c607f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
avconv.c
View File

@ -1523,7 +1523,7 @@ static int transcode_init(void)
{ {
int ret = 0, i, j, k; int ret = 0, i, j, k;
AVFormatContext *oc; AVFormatContext *oc;
AVCodecContext *codec, *icodec; AVCodecContext *codec;
OutputStream *ost; OutputStream *ost;
InputStream *ist; InputStream *ist;
char error[1024]; char error[1024];
@ -1554,6 +1554,7 @@ static int transcode_init(void)
/* for each output stream, we compute the right encoding parameters */ /* for each output stream, we compute the right encoding parameters */
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {
AVCodecContext *icodec = NULL;
ost = output_streams[i]; ost = output_streams[i];
oc = output_files[ost->file_index]->ctx; oc = output_files[ost->file_index]->ctx;
ist = get_input_stream(ost); ist = get_input_stream(ost);
@ -1714,9 +1715,10 @@ static int transcode_init(void)
ost->filter->filter->inputs[0]->sample_aspect_ratio; ost->filter->filter->inputs[0]->sample_aspect_ratio;
codec->pix_fmt = ost->filter->filter->inputs[0]->format; codec->pix_fmt = ost->filter->filter->inputs[0]->format;
if (codec->width != icodec->width || if (icodec &&
codec->height != icodec->height || (codec->width != icodec->width ||
codec->pix_fmt != icodec->pix_fmt) { codec->height != icodec->height ||
codec->pix_fmt != icodec->pix_fmt)) {
codec->bits_per_raw_sample = 0; codec->bits_per_raw_sample = 0;
} }