summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-06 11:57:10 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-04-06 11:57:10 +0000
commite3b183dc3f56d4de72aea2d2e8b02cc4ac938922 (patch)
treeeb3c8d274ba00275e797f106f34e3f5f8918037f /libmpdemux
parentd621bc66d2ae9b9e3d375add71b1b45c6aa66e7f (diff)
downloadmpv-e3b183dc3f56d4de72aea2d2e8b02cc4ac938922.tar.bz2
mpv-e3b183dc3f56d4de72aea2d2e8b02cc4ac938922.tar.xz
- fix gcc warnings, strlcat/strlcpy prototypes
- fix bad sscanf usage in geometry.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15059 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_lavf.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index 3af551b9ab..0c526cfc4c 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -18,6 +18,10 @@
#include "../m_option.h"
#include "avformat.h"
+extern unsigned int codec_get_wav_tag(int id);
+extern enum CodecID codec_get_bmp_id(unsigned int tag);
+extern enum CodecID codec_get_wav_id(unsigned int tag);
+
typedef struct {
//AVInputFormat *avif;
AVFormatContext *oc;
@@ -145,7 +149,7 @@ static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type)
}
-static void fix_parameters(muxer_stream_t *stream, void *sh)
+static void fix_parameters(muxer_stream_t *stream)
{
muxer_stream_priv_t *spriv = (muxer_stream_priv_t *) stream->priv;
AVCodecContext *ctx;