summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpdemux/mpeg_hdr.c10
-rw-r--r--libmpdemux/mpeg_hdr.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c
index 99631718e3..b4bdbd063c 100644
--- a/libmpdemux/mpeg_hdr.c
+++ b/libmpdemux/mpeg_hdr.c
@@ -198,7 +198,7 @@ int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer)
return 0;
}
-int mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer)
+void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer)
{
int n;
n = 0;
@@ -260,20 +260,20 @@ static int h264_parse_vui(mp_mpeg_header_t * picture, unsigned char * buf, unsig
}
}
- if(overscan=getbits(buf, n++, 1))
+ if((overscan=getbits(buf, n++, 1)))
n++;
- if(vsp_color=getbits(buf, n++, 1))
+ if((vsp_color=getbits(buf, n++, 1)))
{
n += 4;
if(getbits(buf, n++, 1))
n += 24;
}
- if(chroma=getbits(buf, n++, 1))
+ if((chroma=getbits(buf, n++, 1)))
{
read_golomb(buf, &n);
read_golomb(buf, &n);
}
- if(timing=getbits(buf, n++, 1))
+ if((timing=getbits(buf, n++, 1)))
{
picture->timeinc_unit = (getbits(buf, n, 8) << 24) | (getbits(buf, n+8, 8) << 16) | (getbits(buf, n+16, 8) << 8) | getbits(buf, n+24, 8);
n += 32;
diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h
index de3bd8d7f5..c1097b1d51 100644
--- a/libmpdemux/mpeg_hdr.h
+++ b/libmpdemux/mpeg_hdr.h
@@ -23,5 +23,5 @@ typedef struct {
int mp_header_process_sequence_header (mp_mpeg_header_t * picture, unsigned char * buffer);
int mp_header_process_extension (mp_mpeg_header_t * picture, unsigned char * buffer);
int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer);
-int mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer);
+void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer);
int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len);