avformat/mpegts: Add missing constants for MPEG-TS stream_id definitions

[ffmpeg] / libavcodec / bytestream.h

diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index 7be7fc22fc8e3451b49211841b8870152ea198e0..d0033f14f3690d6cedf1320b82d42f4d59124770 100644 (file)
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -77,11 +77,15 @@ static av_always_inline type bytestream2_get_ ## name(GetByteContext *g)       \
     }                                                                          \
     return bytestream2_get_ ## name ## u(g);                                   \
 }                                                                              \
+static av_always_inline type bytestream2_peek_ ## name ## u(GetByteContext *g) \
+{                                                                              \
+    return read(g->buffer);                                                    \
+}                                                                              \
 static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g)      \
 {                                                                              \
     if (g->buffer_end - g->buffer < bytes)                                     \
         return 0;                                                              \
-    return read(g->buffer);                                                    \
+    return bytestream2_peek_ ## name ## u(g);                                  \
 }
 
 DEF(uint64_t,     le64, 8, AV_RL64, AV_WL64)
@@ -151,12 +155,12 @@ static av_always_inline void bytestream2_init_writer(PutByteContext *p,
     p->eof          = 0;
 }
 
-static av_always_inline unsigned int bytestream2_get_bytes_left(GetByteContext *g)
+static av_always_inline int bytestream2_get_bytes_left(GetByteContext *g)
 {
     return g->buffer_end - g->buffer;
 }
 
-static av_always_inline unsigned int bytestream2_get_bytes_left_p(PutByteContext *p)
+static av_always_inline int bytestream2_get_bytes_left_p(PutByteContext *p)
 {
     return p->buffer_end - p->buffer;
 }