Add forgotten minor bump and changelog entry for the SAP muxer

[ffmpeg] / libavformat / mpeg.h

diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h
index bdd70254d60cecd94f7644e930b994b1a4951d24..d09b2e81bc6fe1ae65cd960c9655ba6c1f712974 100644 (file)
--- a/libavformat/mpeg.h
+++ b/libavformat/mpeg.h
@@ -1,6 +1,6 @@
 /*
  * MPEG1/2 muxer and demuxer common defines
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPEG_H
-#define FFMPEG_MPEG_H
+#ifndef AVFORMAT_MPEG_H
+#define AVFORMAT_MPEG_H
 
 #include <stdint.h>
-#include "intreadwrite.h"
+#include "libavutil/intreadwrite.h"
 
 #define PACK_START_CODE             ((unsigned int)0x000001ba)
 #define SYSTEM_HEADER_START_CODE    ((unsigned int)0x000001bb)
@@ -69,4 +69,4 @@ static inline int64_t ff_parse_pes_pts(uint8_t *buf) {
              AV_RB16(buf+3) >> 1;
 }
 
-#endif /* FFMPEG_MPEG_H */
+#endif /* AVFORMAT_MPEG_H */