lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders

[ffmpeg] / libavcodec / h261_parser.c

diff --git a/libavcodec/h261_parser.c b/libavcodec/h261_parser.c
index 3f3aac6e471e731fbcb409f554235304c4ce28e9..8a507ee8f27ef93105b7b08107e4ba67c395b5f1 100644 (file)
--- a/libavcodec/h261_parser.c
+++ b/libavcodec/h261_parser.c
@@ -3,25 +3,25 @@
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  * Copyright (c) 2004 Maarten Daniels
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
- * @file h261_parser.c
+ * @file
  * h261codec.
  */
 
@@ -81,10 +81,9 @@ static int h261_parse(AVCodecParserContext *s,
     return next;
 }
 
-AVCodecParser h261_parser = {
-    { CODEC_ID_H261 },
-    sizeof(ParseContext),
-    NULL,
-    h261_parse,
-    ff_parse_close,
+AVCodecParser ff_h261_parser = {
+    .codec_ids      = { AV_CODEC_ID_H261 },
+    .priv_data_size = sizeof(ParseContext),
+    .parser_parse   = h261_parse,
+    .parser_close   = ff_parse_close,
 };