mp3dec: Fix VBR bit rate parsing

[ffmpeg] / libavformat / dv.h

diff --git a/libavformat/dv.h b/libavformat/dv.h
index 726d175d9db2088ea1787833d96f355051169128..e8b2d3790404cacdd7d0e35e4e690a05060f240c 100644 (file)
--- a/libavformat/dv.h
+++ b/libavformat/dv.h
@@ -1,32 +1,41 @@
-/* 
- * General DV muxer/demuxer 
- * Copyright (c) 2003 Roman Shaposhnick
+/*
+ * General DV muxer/demuxer
+ * Copyright (c) 2003 Roman Shaposhnik
  *
  * Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth
  * of DV technical info.
  *
  * Raw DV format
- * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2002 Fabrice Bellard
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
-void* dv_init_demux(AVFormatContext *s, int vid, int aid);
-int dv_get_packet(void*, AVPacket *);
-int dv_produce_packet(void*, AVPacket*, uint8_t*, int);
 
-void* dv_init_mux(AVFormatContext* s);
-int dv_assemble_frame(void *c, AVStream*, const uint8_t*, int, uint8_t**);
-void dv_delete_mux(void*);
+#ifndef AVFORMAT_DV_H
+#define AVFORMAT_DV_H
+
+#include "avformat.h"
+
+typedef struct DVDemuxContext DVDemuxContext;
+DVDemuxContext* avpriv_dv_init_demux(AVFormatContext* s);
+int avpriv_dv_get_packet(DVDemuxContext*, AVPacket *);
+int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int);
+void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset);
+
+typedef struct DVMuxContext DVMuxContext;
+
+#endif /* AVFORMAT_DV_H */