diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:07:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-14 21:07:40 +0100 |
| commit | a0fe1a25fa76809005cb90beb09e66cb7493b353 (patch) | |
| tree | bdbcbe4b6ae9cfc43f4a614c2d85cef715abd483 /libavformat/jvdec.c | |
| parent | 4ab7eb0da2326ccc424f8fdd69ca31c61edc2eb5 (diff) | |
| parent | daf8cf358a098a903d59adb6c0d0cc3262a8c93e (diff) | |
| download | ffmpeg-a0fe1a25fa76809005cb90beb09e66cb7493b353.tar.gz | |
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
avformat: Don't anonymously typedef structs
Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
| -rw-r--r-- | libavformat/jvdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index 21eb14d265..64d31e0ee6 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -33,14 +33,14 @@ #define JV_PREAMBLE_SIZE 5 -typedef struct { +typedef struct JVFrame { int audio_size; /**< audio packet size (bytes) */ int video_size; /**< video packet size (bytes) */ int palette_size; /**< palette size (bytes) */ int video_type; /**< per-frame video compression type */ } JVFrame; -typedef struct { +typedef struct JVDemuxContext { JVFrame *frames; enum { JV_AUDIO = 0, |