diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:55:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:55:49 +0200 |
| commit | 00ebf89dcdeb0587eba80ebd634591873f64624a (patch) | |
| tree | 554be177c46913dcd627624b57d2e87bc5abad6c /libavformat | |
| parent | e1ec9c7fb6ba57f0ce5e6f51703b09b9d550406c (diff) | |
| parent | a7ac1a7b94447f33ae95be4d6d186e2775977f91 (diff) | |
| download | ffmpeg-00ebf89dcdeb0587eba80ebd634591873f64624a.tar.gz | |
Merge commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'
* commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91':
flv: Name an enum and use its type
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flv.h | 2 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/flv.h b/libavformat/flv.h index db9468f469..df5ce3d17f 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -56,7 +56,7 @@ enum { FLV_HEADER_FLAG_HASAUDIO = 4, }; -enum { +enum FlvTagType { FLV_TAG_TYPE_AUDIO = 0x08, FLV_TAG_TYPE_VIDEO = 0x09, FLV_TAG_TYPE_META = 0x12, diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index aea26c7f5c..345be1ea7d 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -789,7 +789,8 @@ skip: static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) { FLVContext *flv = s->priv_data; - int ret, i, type, size, flags; + int ret, i, size, flags; + enum FlvTagType type; int stream_type=-1; int64_t next, pos, meta_pos; int64_t dts, pts = AV_NOPTS_VALUE; |