Merge commit '29c2d06d67724e994980045afa055c6c34611b30'

* commit '29c2d06d67724e994980045afa055c6c34611b30':
  cosmetics: Drop empty comment lines

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/8bps.c
index 2e4464dbb4a77584ecf1d4e2fc82ca105e7a4ff8,7ba2b318e3766f3f61dbd0e044bf2602c61423bb..46344e0e4375e8edc24bd349fbc567ca9a73cf9d
--- 1/libavcodec/8bps.c
--- 2/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 <stdio.h>

diff --cc libavcodec/acelp_filters.h
Simple merge

diff --cc libavcodec/amrwbdec.c
Simple merge

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/cabac.c
index a9fafbdd33ef3b3c3b2fefef10bc6bb47ac4ac67,a96c9f5a2ce7e303a72888f8a6dc45d6eb8395a2..1a877dd2b5c1e0dd7500a4e6a66056c217b70d4e
--- 1/libavcodec/cabac.c
--- 2/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 cbb186bce76551863b482f4ea51c5ea9ce81bdb1,beb5016396ce09d3ee09eb36662f552966f58669..fe72a826cf266a2e37226196388b44ede59af3dc
--- 1/libavcodec/cabac_functions.h
--- 2/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/cavs.c
Simple merge

diff --cc libavcodec/error_resilience.h
index 1f52f200f2a9ef1827d8d7a1cadb830e37b57f60,741325ac9d33b328b4e09ea824848cdb7ef67781..38a57b700c894c8a6ea337b8888613999f3c3af4
--- 1/libavcodec/error_resilience.h
--- 2/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/h264_refs.c
Simple merge

diff --cc libavcodec/h264_slice.c
Simple merge

diff --cc libavcodec/imc.c
Simple merge

diff --cc libavcodec/lcldec.c
Simple merge

diff --cc libavcodec/lclenc.c
Simple merge

diff --cc libavcodec/motion_est.c
Simple merge

diff --cc libavcodec/mpeg4video.h
Simple merge

diff --cc libavcodec/msvideo1.c
Simple merge

diff --cc libavcodec/pcm_tablegen.h
Simple merge

diff --cc libavcodec/profiles.c
index 94069fd692213acd52cf91ad11eb5e28edb8c667,c03106c8e1ad55342809ef33fa5a66a1eed5d66d..da745e13998dfce69c2e4cf4229c69cddd6a5bdd
--- 1/libavcodec/profiles.c
--- 2/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 7e1f74d0ffa38cf23f02b2168cc8ee08a2a2e0a7,2e6c85965d59c1cc77710ed8c3171efc35de01c4..d43e680941b0e63be67f5e43371aa56a8328e0bb
--- 1/libavcodec/profiles.h
--- 2/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/qdm2.c
Simple merge

diff --cc libavcodec/rangecoder.c
Simple merge

diff --cc libavcodec/rl.h
Simple merge

diff --cc libavcodec/shorten.c
Simple merge

diff --cc libavcodec/tscc.c
Simple merge

diff --cc libavcodec/vc1.c
Simple merge

diff --cc libavcodec/vc1dsp.c
index a16c8d512c2943c763e7f810d04008997a86a90f,cbcc8d29da0cf9ee17ffdc352607b35e35804488..2d7e9b7900c99fb9d089e620a89d08f3e4e5ab99
--- 1/libavcodec/vc1dsp.c
--- 2/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/vc1dsp.h
Simple merge

diff --cc libavcodec/version.h
index 52b8f2a51c0fbd58994eab152456922ccd19f81c,2cdad5af15861a23ff522c17257beee2d40f8c8d..abb8c472e8518ed8f1a14f7f42cdeea43daa63cd
--- 1/libavcodec/version.h
--- 2/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 81fda3b084c2cb7187be442d8584cc553096bb7e,f97a523fb795fa2ec5a8dd16411286e8d94b0394..92050277ed193dc319d6c03f84bdad4fa46169dc
--- 1/libavcodec/vorbis_parser.h
--- 2/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 e4db1f74b256fbe1cd849d0894722918536a600d,dcea3da79bad969fc314424589139ed207ccae54..31417c4cb650d897b41112a188debf6f7c01d4d0
--- 1/libavfilter/buffersrc.h
--- 2/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/formats.h
Simple merge

diff --cc libavfilter/pthread.c
index 37ca73f9ff8ac5deb20deef494a73b824afe4d54,a60c1dcfbaeeb37a969b6040e65bc911f3b9b040..ccb915eae56c8bf7f5d9bd4f869178b152bb6dfa
--- 1/libavfilter/pthread.c
--- 2/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 5f347e852112aa2070fc3a6c2b185bcb3226c1b4,42b7cafcf3f36081795bf3b917e211bf5e761bed..c709f17a3376d5a3490beae24c56b826bb98f07b
--- 1/libavfilter/thread.h
--- 2/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/avformat.h
Simple merge

diff --cc libavformat/avio_internal.h
index f7c85882e7a2610e60b2ccdcf87b15dbe7a1236a,86164998676b6e03cfffd7cee373321dd3fd3e2a..54bdfa1cf92dd9d62d205ba2283afb9672b3ca01
--- 1/libavformat/avio_internal.h
--- 2/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 1f09a08aa41b900a4b467757669520cd60647b4b,2a802882f91a1d7d3cbae6bc93132a8f4ba13c6a..68ca17f3cbd5a0f8b350c48d272ac2c7be6548c2
--- 1/libavformat/rtpdec_hevc.c
--- 2/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 b3d5fac2bee9026639c8c874d380f59a7ceea732,59de8f8ad03a47468ee6a665676b46314d50cb24..6375be15b62e7cd9783ce1bf10dbd3cf0c3a6deb
--- 1/libavformat/unix.c
--- 2/libavformat/unix.c
+++ b/libavformat/unix.c
@@@ -23,9 -23,10 +23,8 @@@
   * @file
   *
   * Unix socket url_protocol
-  *
   */
  
 -#include <sys/un.h>
 -
  #include "libavutil/avstring.h"
  #include "libavutil/opt.h"
  #include "os_support.h"

diff --cc libavformat/url.h
index 0b4f2ee376fe7dc21b70fa240b03075e3636bcff,4f153ce2aabb8621df364de34f4251396415fd99..5948df684fa3f0f72d2a85a3d5201ac35f7395ed
--- 1/libavformat/url.h
--- 2/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 71deaf0aa6cfa6011082aea426bfac95abcfa908,67a4cef5f2571cbe6e9b5c23935079902fd09757..16f1ef7b9ce643d8f5e90268c7cbecd522532dd1
--- 1/libavformat/wtvdec.c
--- 2/libavformat/wtv.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 3cad24a05193c4d38530c36594fbad9700a94c21,b78c37767af4efa51f4e92757b9a7a5f30e1e9eb..a75a37b47eb724a798817f9ef3bbdc2d5449ca71
--- 1/libavutil/atomic_suncc.h
--- 2/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 5b8d003396672794f518ae4059baee79c11f37a4,3649b9fbe755648ee9858732781998985e39de02..b0aa78463043801d52db2e491523b7a519dd9a4c
--- 1/libavutil/dict.h
--- 2/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 6ee3e6fb7bd67ef4ce8106271fc358e1d1e44894,ae80cee06268d69165a0c459fb0685850eb23974..5607206a099d5f8f8cd863b99e302d00d0791405
--- 1/libavutil/frame.c
--- 2/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 aadc79688095f8c4fe46c196288b3ad0b34da60f,5a041775986cdf9ad740d8992e297df2c690060d..56001a879860bc86809ba7a4ee7213b8f333d838
--- 1/libavutil/frame.h
--- 2/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/pixfmt.h
Simple merge

diff --cc libavutil/replaygain.h
index 5c03e1993d8ecee08b6c88541fdaf7c08f176c6c,15da8737700794166ce2a7af2ffcc6c1d7081d39..b49bf1a3d968620618665d237e88b48aa90d7a4d
--- 1/libavutil/replaygain.h
--- 2/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.

diff --cc libavutil/samplefmt.h
Simple merge

diff --cc libswscale/ppc/yuv2rgb_altivec.c
Simple merge