diff options
author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /libmpcodecs/ad_twin.c | |
parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'libmpcodecs/ad_twin.c')
-rw-r--r-- | libmpcodecs/ad_twin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c index 954ca17809..9aa304e4fc 100644 --- a/libmpcodecs/ad_twin.c +++ b/libmpcodecs/ad_twin.c @@ -54,8 +54,8 @@ static void (*TvqUpdateVectorInfo)(int varbits, int *ndiv, int bits0[], int bits static int (*TvqCheckVersion)(char *versionID); static void (*TvqGetConfInfo)(tvqConfInfo *cf); -static int (*TvqGetFrameSize)(); -static int (*TvqGetNumFixedBitsPerFrame)(); +static int (*TvqGetFrameSize)(void); +static int (*TvqGetNumFixedBitsPerFrame)(void); #define BYTE_BIT 8 #define BBUFSIZ 1024 /* Bit buffer size (bytes) */ |