diff options
| -rw-r--r-- | doc/developer.texi | 14 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | libswscale/output.c | 14 |
3 files changed, 19 insertions, 11 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 32d666ac68..0c05e708d2 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -198,10 +198,16 @@ autocmd InsertEnter * match ForbiddenWhitespace /\t\|\s\+\%#\@@<!$/ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: @example -(setq c-default-style "k&r") -(setq-default c-basic-offset 4) -(setq-default indent-tabs-mode nil) -(setq-default show-trailing-whitespace t) +(c-add-style "ffmpeg" + '("k&r" + (c-basic-offset . 4) + (indent-tabs-mode nil) + (show-trailing-whitespace t) + (c-offsets-alist + (statement-cont . (c-lineup-assignments +))) + ) + ) +(setq c-default-style "ffmpeg") @end example @section Development Policy diff --git a/libavformat/mov.c b/libavformat/mov.c index f7ae19ab9f..004c4c47ea 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -400,6 +400,7 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom) entries = avio_rb32(pb); if (entries >= UINT_MAX / sizeof(*sc->drefs)) return AVERROR_INVALIDDATA; + av_free(sc->drefs); sc->drefs = av_mallocz(entries * sizeof(*sc->drefs)); if (!sc->drefs) return AVERROR(ENOMEM); @@ -3039,6 +3040,7 @@ static const AVOption options[] = { }; static const AVClass class = {"mov,mp4,m4a,3gp,3g2,mj2", av_default_item_name, options, LIBAVUTIL_VERSION_INT}; + AVInputFormat ff_mov_demuxer = { .name = "mov,mp4,m4a,3gp,3g2,mj2", .long_name = NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"), diff --git a/libswscale/output.c b/libswscale/output.c index 0e5b3f8802..e431441379 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -356,7 +356,7 @@ yuv2mono_2_c_template(SwsContext *c, const int16_t *buf[2], { const int16_t *buf0 = buf[0], *buf1 = buf[1]; const uint8_t * const d128 = dither_8x8_220[y & 7]; - int yalpha1 = 4095 - yalpha; + int yalpha1 = 4096 - yalpha; int i; for (i = 0; i < dstW; i += 8) { @@ -508,8 +508,8 @@ yuv2422_2_c_template(SwsContext *c, const int16_t *buf[2], const int16_t *buf0 = buf[0], *buf1 = buf[1], *ubuf0 = ubuf[0], *ubuf1 = ubuf[1], *vbuf0 = vbuf[0], *vbuf1 = vbuf[1]; - int yalpha1 = 4095 - yalpha; - int uvalpha1 = 4095 - uvalpha; + int yalpha1 = 4096 - yalpha; + int uvalpha1 = 4096 - uvalpha; int i; for (i = 0; i < ((dstW + 1) >> 1); i++) { @@ -667,8 +667,8 @@ yuv2rgb48_2_c_template(SwsContext *c, const int32_t *buf[2], const int32_t *buf0 = buf[0], *buf1 = buf[1], *ubuf0 = ubuf[0], *ubuf1 = ubuf[1], *vbuf0 = vbuf[0], *vbuf1 = vbuf[1]; - int yalpha1 = 4095 - yalpha; - int uvalpha1 = 4095 - uvalpha; + int yalpha1 = 4096 - yalpha; + int uvalpha1 = 4096 - uvalpha; int i; for (i = 0; i < ((dstW + 1) >> 1); i++) { @@ -1008,8 +1008,8 @@ yuv2rgb_2_c_template(SwsContext *c, const int16_t *buf[2], *vbuf0 = vbuf[0], *vbuf1 = vbuf[1], *abuf0 = hasAlpha ? abuf[0] : NULL, *abuf1 = hasAlpha ? abuf[1] : NULL; - int yalpha1 = 4095 - yalpha; - int uvalpha1 = 4095 - uvalpha; + int yalpha1 = 4096 - yalpha; + int uvalpha1 = 4096 - uvalpha; int i; for (i = 0; i < ((dstW + 1) >> 1); i++) { |