alsdec: Clean up error paths

[ffmpeg] / libavcodec / bmp.h

diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h
index cf6ace84510498d999a0e18ca76513f2c4cc153c..ab11523379798acc36361daf2bb6236779a3dfcb 100644 (file)
--- a/libavcodec/bmp.h
+++ b/libavcodec/bmp.h
@@ -2,23 +2,28 @@
  * internals for BMP codecs
  * Copyright (c) 2005 Mans Rullgard
  *
- * 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
  */
 
+#ifndef AVCODEC_BMP_H
+#define AVCODEC_BMP_H
+
+#include "avcodec.h"
+
 typedef struct BMPContext {
     AVFrame picture;
 } BMPContext;
@@ -29,3 +34,5 @@ typedef enum {
     BMP_RLE4        =2,
     BMP_BITFIELDS   =3,
 } BiCompression;
+
+#endif /* AVCODEC_BMP_H */