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/flv.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/flv.h')
| -rw-r--r-- | contrib/ffmpeg/libavformat/flv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/ffmpeg/libavformat/flv.h b/contrib/ffmpeg/libavformat/flv.h index 1484ac15d..4501527aa 100644 --- a/contrib/ffmpeg/libavformat/flv.h +++ b/contrib/ffmpeg/libavformat/flv.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FLV_H -#define FLV_H +#ifndef FFMPEG_FLV_H +#define FFMPEG_FLV_H /* offsets for packed values */ #define FLV_AUDIO_SAMPLESSIZE_OFFSET 1 @@ -71,7 +71,7 @@ enum { }; enum { - FLV_CODECID_PCM_BE = 0, + FLV_CODECID_PCM = 0, FLV_CODECID_ADPCM = 1 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_MP3 = 2 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_PCM_LE = 3 << FLV_AUDIO_CODECID_OFFSET, @@ -107,4 +107,4 @@ typedef enum { AMF_DATA_TYPE_UNSUPPORTED = 0x0d, } AMFDataType; -#endif /* FLV_H */ +#endif /* FFMPEG_FLV_H */ |