Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'

* commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b':
  lavc: Sanitize header inclusion guards

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --combined libavcodec/dct32.h
index f4b2471,8bf6880..61bf223
--- 1/libavcodec/dct32.h
--- 2/libavcodec/dct32.h
+++ b/libavcodec/dct32.h
@@@ -1,18 -1,18 +1,18 @@@
  /*
 - * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * 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
   */
  
@@@ -22,4 -22,4 +22,4 @@@
  void ff_dct32_float(float *dst, const float *src);
  void ff_dct32_fixed(int *dst, const int *src);
  
- #endif
+ #endif /* AVCODEC_DCT32_H */

diff --combined libavcodec/hqxdsp.h
index 16a42cc,2cd2a8e..39ab3e2
--- 1/libavcodec/hqxdsp.h
--- 2/libavcodec/hqxdsp.h
+++ b/libavcodec/hqxdsp.h
@@@ -1,20 -1,20 +1,20 @@@
  /*
   * HQX DSP routines
   *
 - * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * 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
   */
  
@@@ -37,4 -37,3 +37,3 @@@ typedef struct HQXDSPContext 
  void ff_hqxdsp_init(HQXDSPContext *c);
  
  #endif /* AVCODEC_HQXDSP_H */
- 

diff --combined libavcodec/mpegutils.h
index 37cc391,9b5a576..6ac5cef
--- 1/libavcodec/mpegutils.h
--- 2/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@@ -1,20 -1,20 +1,20 @@@
  /*
   * Mpeg video formats-related defines and utility functions
   *
 - * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * 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
   */
  
@@@ -132,4 -132,4 +132,4 @@@ void ff_draw_horiz_band(AVCodecContext 
                          int y, int h, int picture_structure, int first_field,
                          int low_delay);
  
- #endif /* AVCODEC_PICTTYPE_H */
+ #endif /* AVCODEC_MPEGUTILS_H */

diff --combined libavcodec/pngdsp.h
index fbc1a50,607fe64..5475d0d
--- 1/libavcodec/pngdsp.h
--- 2/libavcodec/pngdsp.h
+++ b/libavcodec/pngdsp.h
@@@ -2,20 -2,20 +2,20 @@@
   * PNG image format
   * Copyright (c) 2008 Loren Merrit <lorenm@u.washington.edu>
   *
 - * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * 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
   */
  
@@@ -25,9 -25,9 +25,9 @@@
  #include <stdint.h>
  
  typedef struct PNGDSPContext {
 -    void (*add_bytes_l2)(uint8_t *dst  /* align 16 */,
 +    void (*add_bytes_l2)(uint8_t *dst,
                           uint8_t *src1 /* align 16 */,
 -                         uint8_t *src2 /* align 16 */, int w);
 +                         uint8_t *src2, int w);
  
      /* this might write to dst[w] */
      void (*add_paeth_prediction)(uint8_t *dst, uint8_t *src,
@@@ -37,4 -37,4 +37,4 @@@
  void ff_pngdsp_init(PNGDSPContext *dsp);
  void ff_pngdsp_init_x86(PNGDSPContext *dsp);
  
- #endif /* AVCDODEC_PNGDSP_H */
+ #endif /* AVCODEC_PNGDSP_H */

diff --combined libavcodec/twinvq.h
index 206eeaa,3dc0ab4..228a489
--- 1/libavcodec/twinvq.h
--- 2/libavcodec/twinvq.h
+++ b/libavcodec/twinvq.h
@@@ -2,20 -2,20 +2,20 @@@
   * TwinVQ decoder
   * Copyright (c) 2009 Vitor Sessak
   *
 - * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * 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
   */
  
@@@ -136,7 -136,7 +136,7 @@@ typedef struct TwinVQModeTab 
  
  typedef struct TwinVQContext {
      AVCodecContext *avctx;
 -    AVFloatDSPContext fdsp;
 +    AVFloatDSPContext *fdsp;
      FFTContext mdct_ctx[3];
  
      const TwinVQModeTab *mtab;
@@@ -200,4 -200,4 +200,4 @@@ int ff_twinvq_decode_frame(AVCodecConte
  int ff_twinvq_decode_close(AVCodecContext *avctx);
  int ff_twinvq_decode_init(AVCodecContext *avctx);
  
- #endif /* AVCODEC_TWINVQ_DATA_H */
+ #endif /* AVCODEC_TWINVQ_H */

diff --combined libavcodec/wma_freqs.h
index 85c5f69,d40ab65..6fd93e4
--- 1/libavcodec/wma_freqs.h
--- 2/libavcodec/wma_freqs.h
+++ b/libavcodec/wma_freqs.h
@@@ -1,18 -1,18 +1,18 @@@
  /*
 - * 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.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * 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
   */
  
@@@ -23,4 -23,4 +23,4 @@@
  
  extern const uint16_t ff_wma_critical_freqs[25];
  
- #endif /* AVCODEC_WMA_FREQS */
+ #endif /* AVCODEC_WMA_FREQS_H */