From: Derek Buitenhuis Date: Wed, 24 Feb 2016 17:31:44 +0000 (+0000) Subject: Merge commit '29c2d06d67724e994980045afa055c6c34611b30' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1a12eb4a7314900b9569d6cc76814f39f95922bd;p=ffmpeg Merge commit '29c2d06d67724e994980045afa055c6c34611b30' * commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis --- 1a12eb4a7314900b9569d6cc76814f39f95922bd diff --cc libavcodec/8bps.c index 2e4464dbb4a,7ba2b318e37..46344e0e437 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@@ -27,8 -27,7 +27,7 @@@ * * Supports: PAL8 (RGB 8bpp, paletted) * : BGR24 (RGB 24bpp) (can also output it as RGB32) - * : RGB32 (RGB 32bpp, 4th plane is probably alpha and it's ignored) + * : RGB32 (RGB 32bpp, 4th plane is alpha) - * */ #include diff --cc libavcodec/cabac.c index a9fafbdd33e,a96c9f5a2ce..1a877dd2b5c --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@@ -159,23 -158,9 +159,22 @@@ const uint8_t ff_h264_cabac_tables[512 }; /** - * * @param buf_size size of buf in bits */ -void ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size){ +void ff_init_cabac_encoder(CABACContext *c, uint8_t *buf, int buf_size){ + init_put_bits(&c->pb, buf, buf_size); + + c->low= 0; + c->range= 0x1FE; + c->outstanding_count= 0; + c->pb.bit_left++; //avoids firstBitFlag +} + +/** + * + * @param buf_size size of buf in bits + */ +int ff_init_cabac_decoder(CABACContext *c, const uint8_t *buf, int buf_size){ c->bytestream_start= c->bytestream= buf; c->bytestream_end= buf + buf_size; diff --cc libavcodec/cabac_functions.h index cbb186bce76,beb5016396c..fe72a826cf2 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@@ -172,10 -154,8 +172,9 @@@ static av_always_inline int get_cabac_b #endif /** - * * @return the number of bytes read or 0 if no end */ +#ifndef get_cabac_terminate static int av_unused get_cabac_terminate(CABACContext *c){ c->range -= 2; if(c->low < c->range<<(CABAC_BITS+1)){ diff --cc libavcodec/error_resilience.h index 1f52f200f2a,741325ac9d3..38a57b700c8 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavcodec/profiles.c index 94069fd6922,c03106c8e1a..da745e13998 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavcodec/profiles.h index 7e1f74d0ffa,2e6c85965d5..d43e680941b --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavcodec/vc1dsp.c index a16c8d512c2,cbcc8d29da0..2d7e9b7900c --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@@ -22,15 -22,11 +22,14 @@@ /** * @file * VC-1 and WMV3 decoder - * */ +#include "libavutil/avassert.h" #include "libavutil/common.h" +#include "libavutil/intreadwrite.h" #include "h264chroma.h" #include "qpeldsp.h" +#include "rnd_avg.h" #include "vc1dsp.h" #include "startcode.h" diff --cc libavcodec/version.h index 52b8f2a51c0,2cdad5af158..abb8c472e85 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavcodec/vorbis_parser.h index 81fda3b084c,f97a523fb79..92050277ed1 --- a/libavcodec/vorbis_parser.h +++ b/libavcodec/vorbis_parser.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavfilter/buffersrc.h index e4db1f74b25,dcea3da79ba..31417c4cb65 --- a/libavfilter/buffersrc.h +++ b/libavfilter/buffersrc.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavfilter/pthread.c index 37ca73f9ff8,a60c1dcfbae..ccb915eae56 --- a/libavfilter/pthread.c +++ b/libavfilter/pthread.c @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavfilter/thread.h index 5f347e85211,42b7cafcf3f..c709f17a337 --- a/libavfilter/thread.h +++ b/libavfilter/thread.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavformat/avio_internal.h index f7c85882e7a,86164998676..54bdfa1cf92 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavformat/rtpdec_hevc.c index 1f09a08aa41,2a802882f91..68ca17f3cbd --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@@ -15,15 -15,12 +15,14 @@@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/base64.h" +#include "libavcodec/get_bits.h" #include "avformat.h" #include "rtpdec.h" diff --cc libavformat/unix.c index b3d5fac2bee,59de8f8ad03..6375be15b62 --- a/libavformat/unix.c +++ b/libavformat/unix.c @@@ -23,9 -23,10 +23,8 @@@ * @file * * Unix socket url_protocol - * */ -#include - #include "libavutil/avstring.h" #include "libavutil/opt.h" #include "os_support.h" diff --cc libavformat/url.h index 0b4f2ee376f,4f153ce2aab..5948df684fa --- a/libavformat/url.h +++ b/libavformat/url.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavformat/wtvdec.c index 71deaf0aa6c,67a4cef5f25..16f1ef7b9ce --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@@ -44,17 -46,21 +44,15 @@@ #define LEN_PRETTY_GUID 34 /* - * * File system routines - * */ -#define WTV_SECTOR_BITS 12 -#define WTV_SECTOR_SIZE (1 << WTV_SECTOR_BITS) -#define WTV_BIGSECTOR_BITS 18 - -#define SHIFT_SECTOR_BITS(a) ((int64_t)(a) << WTV_SECTOR_BITS) - typedef struct WtvFile { - AVIOContext *pb_filesystem; /** file system (AVFormatContext->pb) */ + AVIOContext *pb_filesystem; /**< file system (AVFormatContext->pb) */ - int sector_bits; /** sector shift bits; used to convert sector number into pb_filesystem offset */ - uint32_t *sectors; /** file allocation table */ - int nb_sectors; /** number of sectors */ + int sector_bits; /**< sector shift bits; used to convert sector number into pb_filesystem offset */ + uint32_t *sectors; /**< file allocation table */ + int nb_sectors; /**< number of sectors */ int error; int64_t position; diff --cc libavutil/atomic_suncc.h index 3cad24a0519,b78c37767af..a75a37b47eb --- a/libavutil/atomic_suncc.h +++ b/libavutil/atomic_suncc.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavutil/dict.h index 5b8d0033966,3649b9fbe75..b0aa7846304 --- a/libavutil/dict.h +++ b/libavutil/dict.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. @@@ -65,16 -54,14 +64,15 @@@ } av_dict_free(&d); @endcode - * */ -#define AV_DICT_MATCH_CASE 1 -#define AV_DICT_IGNORE_SUFFIX 2 +#define AV_DICT_MATCH_CASE 1 /**< Only get an entry with exact-case key match. Only relevant in av_dict_get(). */ +#define AV_DICT_IGNORE_SUFFIX 2 /**< Return first entry in a dictionary whose first part corresponds to the search key, + ignoring the suffix of the found key string. Only relevant in av_dict_get(). */ #define AV_DICT_DONT_STRDUP_KEY 4 /**< Take ownership of a key that's been - allocated with av_malloc() and children. */ + allocated with av_malloc() or another memory allocation function. */ #define AV_DICT_DONT_STRDUP_VAL 8 /**< Take ownership of a value that's been - allocated with av_malloc() and chilren. */ + allocated with av_malloc() or another memory allocation function. */ #define AV_DICT_DONT_OVERWRITE 16 ///< Don't overwrite existing entries. #define AV_DICT_APPEND 32 /**< If the entry already exists, append to it. Note that no delimiter is added, the strings are simply concatenated. */ diff --cc libavutil/frame.c index 6ee3e6fb7bd,ae80cee0626..5607206a099 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavutil/frame.h index aadc7968809,5a041775986..56001a87986 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. diff --cc libavutil/replaygain.h index 5c03e1993d8,15da8737700..b49bf1a3d96 --- a/libavutil/replaygain.h +++ b/libavutil/replaygain.h @@@ -1,8 -1,7 +1,7 @@@ /* - * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version.