summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-15 22:28:08 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-15 22:28:08 +0000
commit0eee2d2bd5a9aa03ff9211ef481914041e4ec644 (patch)
tree324e39188d346f802227ffbf849f64414adf4130 /libmpdemux
parent2990ec16824583a91ef1c69e4f543de7fe4c8939 (diff)
downloadmpv-0eee2d2bd5a9aa03ff9211ef481914041e4ec644.tar.bz2
mpv-0eee2d2bd5a9aa03ff9211ef481914041e4ec644.tar.xz
Fix value of bit counter at end of functions to prepare for future patches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30903 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/mpeg_hdr.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c
index d91019ad13..1ce9d28441 100644
--- a/libmpdemux/mpeg_hdr.c
+++ b/libmpdemux/mpeg_hdr.c
@@ -251,9 +251,8 @@ int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer)
n++; //marker bit
- if(getbits(buffer, n, 1)) { //fixed_vop_timeinc
- n++;
- n = read_timeinc(picture, buffer, n);
+ if(getbits(buffer, n++, 1)) { //fixed_vop_timeinc
+ n += read_timeinc(picture, buffer, n);
if(picture->timeinc_unit)
picture->fps = (float) picture->timeinc_resolution / (float) picture->timeinc_unit;
@@ -276,7 +275,7 @@ void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer)
n++;
getbits(buffer, n, 1);
n++;
- n = read_timeinc(picture, buffer, n);
+ n += read_timeinc(picture, buffer, n);
}
#define min(a, b) ((a) <= (b) ? (a) : (b))