diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavformat/riff.h | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavformat/riff.h')
| -rw-r--r-- | contrib/ffmpeg/libavformat/riff.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/ffmpeg/libavformat/riff.h b/contrib/ffmpeg/libavformat/riff.h index 45c72dde6..dc970f619 100644 --- a/contrib/ffmpeg/libavformat/riff.h +++ b/contrib/ffmpeg/libavformat/riff.h @@ -25,8 +25,11 @@ * do NOT include this in end user applications */ -#ifndef FF_RIFF_H -#define FF_RIFF_H +#ifndef FFMPEG_RIFF_H +#define FFMPEG_RIFF_H + +#include "avcodec.h" +#include "avio.h" offset_t start_tag(ByteIOContext *pb, const char *tag); void end_tag(ByteIOContext *pb, offset_t start); @@ -46,10 +49,6 @@ extern const AVCodecTag codec_wav_tags[]; unsigned int codec_get_tag(const AVCodecTag *tags, int id); enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag); -unsigned int codec_get_bmp_tag(int id) attribute_deprecated; //use av_codec_get_tag -unsigned int codec_get_wav_tag(int id) attribute_deprecated; //use av_codec_get_tag -enum CodecID codec_get_bmp_id(unsigned int tag) attribute_deprecated; //use av_codec_get_id -enum CodecID codec_get_wav_id(unsigned int tag) attribute_deprecated; //use av_codec_get_id void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); -#endif +#endif /* FFMPEG_RIFF_H */ |