May 2012 - ffmpeg-cvslog - lists.ffmpeg.org

gifenc: support resolutions up to 65535x65535
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Piotr Bandurski <ami_stuff(a)o2.pl> | Thu May 31 15:17:59 2012 +0200| [e03ddbcd919b11a289c2de8a47c83efe7fab32fb] | committer: Michael Niedermayer gifenc: support resolutions up to 65535x65535 Maybe someone can add a check in the second gif encoder (rgb24), because I'm not sure where it should be added. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e03ddbcd919b11a28… --- libavcodec/gif.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/gif.c b/libavcodec/gif.c index ec4be27..5cb635d 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -145,6 +145,11 @@ static av_cold int gif_encode_init(AVCodecContext *avctx) { GIFContext *s = avctx->priv_data; + if (avctx->width > 65535 || avctx->height > 65535) { + av_log(avctx, AV_LOG_ERROR, "GIF does not support resolutions above 65535x65535\n"); + return -1; + } + avctx->coded_frame = &s->picture; s->lzw = av_mallocz(ff_lzw_encode_state_size); if (!s->lzw)

1 0

mjpegenc: add a limit for maximum supported resolution
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Piotr Bandurski <ami_stuff(a)o2.pl> | Thu May 31 13:49:00 2012 +0200| [d2581dcca6abe74e3fbf44df815194a6aea71bd6] | committer: Michael Niedermayer mjpegenc: add a limit for maximum supported resolution jpeg does not allow more than 65000 pixels for width and height Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2581dcca6abe74e3… --- libavcodec/mjpegenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 9326d4d..53a45b4 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -48,6 +48,11 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s) { MJpegContext *m; + if (s->width > 65500 || s->height > 65500) { + av_log(s, AV_LOG_ERROR, "JPEG does not support resolutions above 65500x65500\n"); + return -1; + } + m = av_malloc(sizeof(MJpegContext)); if (!m) return -1;

1 0

mxfenc: support 50 and 60 frame rates
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron(a)gmail.com> | Sat May 26 18:09:07 2012 +0200| [320e537baf241ccfa5187f2c7cdd758e74d88d4d] | committer: Michael Niedermayer mxfenc: support 50 and 60 frame rates Reviewed-by: Tomas Härdin <tomas.hardin(a)codemill.se> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=320e537baf241ccfa… --- libavformat/mxfenc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index b2ef1f3..f87a50a 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -44,8 +44,10 @@ #include "internal.h" #include "mxf.h" -static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 }; -static const int PAL_samples_per_frame[] = { 1920, 0 }; +static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 }; +static const int NTSC_60_samples_per_frame[] = { 801, 801, 801, 801, 800, 0 }; +static const int PAL_samples_per_frame[] = { 1920, 0 }; +static const int PAL_50_samples_per_frame[] = { 960, 0 }; extern AVOutputFormat ff_mxf_d10_muxer; @@ -1423,10 +1425,18 @@ static int mxf_write_header(AVFormatContext *s) samples_per_frame = PAL_samples_per_frame; mxf->time_base = (AVRational){ 1, 25 }; mxf->timecode_base = 25; + } else if (fabs(av_q2d(st->codec->time_base) - 1/50.0) < 0.0001) { + samples_per_frame = PAL_50_samples_per_frame; + mxf->time_base = (AVRational){ 1, 50 }; + mxf->timecode_base = 50; } else if (fabs(av_q2d(st->codec->time_base) - 1001/30000.0) < 0.0001) { samples_per_frame = NTSC_samples_per_frame; mxf->time_base = (AVRational){ 1001, 30000 }; mxf->timecode_base = 30; + } else if (fabs(av_q2d(st->codec->time_base) - 1001/60000.0) < 0.0001) { + samples_per_frame = NTSC_60_samples_per_frame; + mxf->time_base = (AVRational){ 1001, 60000 }; + mxf->timecode_base = 60; } else { av_log(s, AV_LOG_ERROR, "unsupported video frame rate\n"); return -1;

1 0

ipmovie_probe: speedup by avoiding memcmp() call
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 16:19:26 2012 +0200| [cc4d80c99ff3169b71c62691d5c7602ef673c3dc] | committer: Michael Niedermayer ipmovie_probe: speedup by avoiding memcmp() call Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc4d80c99ff3169b7… --- libavformat/ipmovie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index a60b961..30ed16d 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -529,8 +529,9 @@ static int ipmovie_probe(AVProbeData *p) uint8_t *b = p->buf; uint8_t *b_end = p->buf + p->buf_size - sizeof(signature); do { - if (memcmp(b++, signature, sizeof(signature)) == 0) + if (b[0] == signature[0] && memcmp(b, signature, sizeof(signature)) == 0) return AVPROBE_SCORE_MAX; + b++; } while (b < b_end); return 0;

1 0

ac3_probe: speedup by checking for header earlier
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 16:14:27 2012 +0200| [ebfe0c6eb800222955d480b943b646e7a6ee2a1c] | committer: Michael Niedermayer ac3_probe: speedup by checking for header earlier Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebfe0c6eb80022295… --- libavformat/ac3dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index ba05f74..3741ee4 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -37,6 +37,8 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id) end = buf + p->buf_size; for(; buf < end; buf++) { + if(buf > p->buf && (buf[0] != 0x0B || buf[1] != 0x77) ) + continue; buf2 = buf; for(frames = 0; buf2 < end; frames++) {

1 0

probetest: allow specifying parameters on the command line
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 15:53:58 2012 +0200| [6cfaccabc4edc3321c9a47e349236815b9d649e2] | committer: Michael Niedermayer probetest: allow specifying parameters on the command line Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cfaccabc4edc3321… --- tools/probetest.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/probetest.c b/tools/probetest.c index 36a05a3..f8a617d 100644 --- a/tools/probetest.c +++ b/tools/probetest.c @@ -49,12 +49,19 @@ static void probe(AVProbeData *pd, int type, int p, int size) } } -int main(void) +int main(int argc, char **argv) { unsigned int p, i, type, size, retry; AVProbeData pd; AVLFG state; PutBitContext pb; + int retry_count= 4097; + int max_size = 65537; + + if(argc >= 2) + retry_count = atoi(argv[1]); + if(argc >= 3) + max_size = atoi(argv[2]); avcodec_register_all(); av_register_all(); @@ -62,14 +69,14 @@ int main(void) av_lfg_init(&state, 0xdeadbeef); pd.buf = NULL; - for (size = 1; size < 65537; size *= 2) { + for (size = 1; size < max_size; size *= 2) { pd.buf_size = size; pd.buf = av_realloc(pd.buf, size + AVPROBE_PADDING_SIZE); pd.filename = ""; fprintf(stderr, "testing size=%d\n", size); - for (retry = 0; retry < 4097; retry += FFMAX(size, 32)) { + for (retry = 0; retry < retry_count; retry += FFMAX(size, 32)) { for (type = 0; type < 4; type++) { for (p = 0; p < 4096; p++) { unsigned hist = 0;

1 0

yop_probe: check more fields to avoid detecting random data as yop
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 14:47:15 2012 +0200| [76170f537304cc845d6d334d36daa0a0f16efb32] | committer: Michael Niedermayer yop_probe: check more fields to avoid detecting random data as yop Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76170f537304cc845… --- libavformat/yop.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/yop.c b/libavformat/yop.c index e8f4e8e..c7d3f65 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -38,10 +38,15 @@ typedef struct yop_dec_context { static int yop_probe(AVProbeData *probe_packet) { if (AV_RB16(probe_packet->buf) == AV_RB16("YO") && + probe_packet->buf[2]<10 && + probe_packet->buf[3]<10 && probe_packet->buf[6] && probe_packet->buf[7] && !(probe_packet->buf[8] & 1) && - !(probe_packet->buf[10] & 1)) + !(probe_packet->buf[10] & 1) && + AV_RL16(probe_packet->buf + 12 + 6) >= 920 && + AV_RL16(probe_packet->buf + 12 + 6) < probe_packet->buf[12] * 3 + 4 + probe_packet->buf[7] * 2048 + ) return AVPROBE_SCORE_MAX * 3 / 4; return 0;

1 0

ffmpeg: allow overriding input top field first
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 12:29:07 2012 +0200| [60de7616575cfea3e01bb19ff476a97a8ab8da3b] | committer: Michael Niedermayer ffmpeg: allow overriding input top field first Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60de7616575cfea3e… --- ffmpeg.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index a97327b..849bd70 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -237,6 +237,7 @@ typedef struct InputStream { int showed_multi_packet_warning; AVDictionary *opts; AVRational framerate; /* framerate forced with -r */ + int top_field_first; int resample_height; int resample_width; @@ -2574,6 +2575,9 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) return ret; } + if(ist->top_field_first>=0) + decoded_frame->top_field_first = ist->top_field_first; + best_effort_timestamp= av_frame_get_best_effort_timestamp(decoded_frame); if(best_effort_timestamp != AV_NOPTS_VALUE) ist->next_pts = ist->pts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q); @@ -4082,6 +4086,9 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) exit_program(1); } + ist->top_field_first = -1; + MATCH_PER_STREAM_OPT(top_field_first, i, ist->top_field_first, ic, st); + break; case AVMEDIA_TYPE_AUDIO: guess_input_channel_layout(ist);

1 0

binkaudio: check number of channels
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu May 31 08:58:31 2012 +0000| [824a6975ee066e944b7a20d1e220fd8974fb6174] | committer: Paul B Mahol binkaudio: check number of channels Fixes #1380. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=824a6975ee066e944… --- libavcodec/binkaudio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index eb182d1..ee66b8b 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -91,9 +91,9 @@ static av_cold int decode_init(AVCodecContext *avctx) frame_len_bits = 11; } - if (avctx->channels > MAX_CHANNELS) { - av_log(avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels); - return -1; + if (avctx->channels < 1 || avctx->channels > MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "invalid number of channels: %d\n", avctx->channels); + return AVERROR_INVALIDDATA; } s->version_b = avctx->extradata && avctx->extradata[3] == 'b';

1 0

indeo5: check quant_mat
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 05:01:28 2012 +0200| [8aaa00c3012d425ce50efffadb813ad62d1ff3d5] | committer: Michael Niedermayer indeo5: check quant_mat prevents out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8aaa00c3012d425ce… --- libavcodec/indeo5.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 3c7242a..e989690 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -199,6 +199,10 @@ static int decode_gop_header(IVI45DecContext *ctx, AVCodecContext *avctx) } if (band->blk_size == 8) { + if(quant_mat >= 5){ + av_log(avctx, AV_LOG_ERROR, "quant_mat %d too large!\n", quant_mat); + return -1; + } band->intra_base = &ivi5_base_quant_8x8_intra[quant_mat][0]; band->inter_base = &ivi5_base_quant_8x8_inter[quant_mat][0]; band->intra_scale = &ivi5_scale_quant_8x8_intra[quant_mat][0];

1 0