Merge commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef'

* commit '61e7c7f27b0a2652bf5cd282b97762ee99d025ef':
  svq3: Adjust #endif comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --combined libavcodec/svq3.h
index 7a57d8ad0173f3931f169c2718030f0796a89756,a20e620f8eb6fecd40836abae601f8d1b7b5c248..5007a8c1c0d8bd8f1d777c171bf8d226dadd84d0
--- 1/libavcodec/svq3.h
--- 2/libavcodec/svq3.h
+++ b/libavcodec/svq3.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
   */
  
@@@ -24,4 -24,4 +24,4 @@@
  void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp);
  void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block, int stride, int qp, int dc);
  
- #endif /* AVCODEC_DSPUTIL_H */
+ #endif /* AVCODEC_SVQ3_H */