Projects
Multimedia
avidemux3
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 8
View file
avidemux3.changes
Changed
@@ -1,4 +1,8 @@ ------------------------------------------------------------------- +Fri Aug 22 2014 - joerg.lorenzen@ki.tng.de +- update internal ffmpeg to version 1.2.8 + +------------------------------------------------------------------- Tue Jun 24 2014 - joerg.lorenzen@ki.tng.de - update internal ffmpeg to version 1.2.7
View file
avidemux3.spec
Changed
@@ -16,7 +16,7 @@ # -%define ffmpeg_version 1.2.7 +%define ffmpeg_version 1.2.8 Name: avidemux3 Summary: Graphical video editing and transcoding tool
View file
ffmpeg-1.2.7.tar.bz2/Changelog -> ffmpeg-1.2.8.tar.bz2/Changelog
Changed
@@ -1,6 +1,14 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. +version 1.2.8: +- proresenc_ks: fix buffer overflow +- iff: fix crash +- cdgraphics: fix infinite loop +- Fix Ticket3804 +- Fix Ticket3208 + + version 1.2: - VDPAU hardware acceleration through normal hwaccel
View file
ffmpeg-1.2.7.tar.bz2/RELEASE -> ffmpeg-1.2.8.tar.bz2/RELEASE
Changed
@@ -1,1 +1,1 @@ -1.2.7 +1.2.8
View file
ffmpeg-1.2.7.tar.bz2/VERSION -> ffmpeg-1.2.8.tar.bz2/VERSION
Changed
@@ -1,1 +1,1 @@ -1.2.7 +1.2.8
View file
ffmpeg-1.2.7.tar.bz2/doc/Doxyfile -> ffmpeg-1.2.8.tar.bz2/doc/Doxyfile
Changed
@@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.2.7 +PROJECT_NUMBER = 1.2.8 # With the PROJECT_LOGO tag one can specify an logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55
View file
ffmpeg-1.2.7.tar.bz2/libavcodec/cdgraphics.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/cdgraphics.c
Changed
@@ -361,11 +361,10 @@ *got_frame = 1; } else { *got_frame = 0; - buf_size = 0; } *(AVFrame *) data = cc->frame; - return buf_size; + return avpkt->size; } static av_cold int cdg_decode_end(AVCodecContext *avctx)
View file
ffmpeg-1.2.7.tar.bz2/libavcodec/dv.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/dv.c
Changed
@@ -350,11 +350,6 @@ static const int vs_total_ac_bits = (100 * 4 + 68*2) * 5; static const int mb_area_start[5] = { 1, 6, 21, 43, 64 }; -static inline int put_bits_left(PutBitContext* s) -{ - return (s->buf_end - s->buf) * 8 - put_bits_count(s); -} - #if CONFIG_SMALL /* Converts run and level (where level != 0) pair into VLC, returning bit size */ static av_always_inline int dv_rl2vlc(int run, int level, int sign, uint32_t* vlc)
View file
ffmpeg-1.2.7.tar.bz2/libavcodec/dvdsub_parser.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/dvdsub_parser.c
Changed
@@ -45,8 +45,11 @@ DVDSubParseContext *pc = s->priv_data; if (pc->packet_index == 0) { - if (buf_size < 2) - return 0; + if (buf_size < 2 || AV_RB16(buf) && buf_size < 6) { + if (buf_size) + av_log(avctx, AV_LOG_DEBUG, "Parser input %d too small\n", buf_size); + return buf_size; + } pc->packet_len = AV_RB16(buf); if (pc->packet_len == 0) /* HD-DVD subpicture packet */ pc->packet_len = AV_RB32(buf+2);
View file
ffmpeg-1.2.7.tar.bz2/libavcodec/iff.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/iff.c
Changed
@@ -832,9 +832,9 @@ break; case 4: bytestream2_init(&gb, buf, buf_size); - if (avctx->codec_tag == MKTAG('R','G','B','8')) + if (avctx->codec_tag == MKTAG('R','G','B','8') && avctx->pix_fmt == AV_PIX_FMT_RGB32) decode_rgb8(&gb, s->frame.data[0], avctx->width, avctx->height, s->frame.linesize[0]); - else if (avctx->codec_tag == MKTAG('R','G','B','N')) + else if (avctx->codec_tag == MKTAG('R','G','B','N') && avctx->pix_fmt == AV_PIX_FMT_RGB444) decode_rgbn(&gb, s->frame.data[0], avctx->width, avctx->height, s->frame.linesize[0]); else return unsupported(avctx);
View file
ffmpeg-1.2.7.tar.bz2/libavcodec/proresenc_kostya.c -> ffmpeg-1.2.8.tar.bz2/libavcodec/proresenc_kostya.c
Changed
@@ -456,6 +456,11 @@ num_cblocks, plane_factor, qmat); total_size += sizes[i]; + if (put_bits_left(pb) < 0) { + av_log(avctx, AV_LOG_ERROR, "Serious underevaluation of" + "required buffer size"); + return AVERROR_BUFFER_TOO_SMALL; + } } return total_size; } @@ -754,9 +759,9 @@ avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; - pkt_size = ctx->frame_size_upper_bound + FF_MIN_BUFFER_SIZE; + pkt_size = ctx->frame_size_upper_bound; - if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size)) < 0) + if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size + FF_MIN_BUFFER_SIZE)) < 0) return ret; orig_buf = pkt->data; @@ -833,7 +838,9 @@ slice_hdr = buf; buf += slice_hdr_size - 1; init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8); - encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice); + ret = encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice); + if (ret < 0) + return ret; bytestream_put_byte(&slice_hdr, q); slice_size = slice_hdr_size + sizes[ctx->num_planes - 1];
View file
ffmpeg-1.2.7.tar.bz2/libavcodec/put_bits.h -> ffmpeg-1.2.8.tar.bz2/libavcodec/put_bits.h
Changed
@@ -76,6 +76,14 @@ } /** + * @return the number of bits available in the bitstream. + */ +static inline int put_bits_left(PutBitContext* s) +{ + return (s->buf_end - s->buf_ptr) * 8 - 32 + s->bit_left; +} + +/** * Pad the end of the output stream with zeros. */ static inline void flush_put_bits(PutBitContext *s)
View file
ffmpeg-1.2.7.tar.bz2/libavformat/tee.c -> ffmpeg-1.2.8.tar.bz2/libavformat/tee.c
Changed
@@ -251,7 +251,7 @@ if ((ret = av_copy_packet(&pkt2, pkt)) < 0 || (ret = av_dup_packet(&pkt2))< 0) if (!ret_all) { - ret = ret_all; + ret_all = ret; continue; } tb = avf ->streams[s]->time_base;
View file
ffmpeg-1.2.7.tar.bz2/libavformat/utils.c -> ffmpeg-1.2.8.tar.bz2/libavformat/utils.c
Changed
@@ -1533,7 +1533,8 @@ } /* read packet from packet buffer, if there is data */ - if (!(next_pkt->pts == AV_NOPTS_VALUE && + st = s->streams[next_pkt->stream_index]; + if (!(next_pkt->pts == AV_NOPTS_VALUE && st->discard < AVDISCARD_ALL && next_pkt->dts != AV_NOPTS_VALUE && !eof)) { ret = read_from_packet_buffer(&s->packet_buffer, &s->packet_buffer_end, pkt);
View file
ffmpeg-1.2.7.tar.bz2/version.sh -> ffmpeg-1.2.8.tar.bz2/version.sh
Changed
@@ -2,7 +2,11 @@ # check for git short hash if ! test "$revision"; then - revision=$(cd "$1" && git describe --tags --match N 2> /dev/null) + if (cd "$1" && grep git RELEASE 2> /dev/null >/dev/null) ; then + revision=$(cd "$1" && git describe --tags --match N 2> /dev/null) + else + revision=$(cd "$1" && git describe --tags --always 2> /dev/null) + fi fi # Shallow Git clones (--depth) do not have the N tag:
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.