diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:51:58 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:51:58 +0100 |
| commit | 1117d6f4b122aa4189c27e3568154e029dfdcbe7 (patch) | |
| tree | a42e3d85e5cbf7eedb3505e8ea9126b7caf2c6d4 /libavcodec/ivi.h | |
| parent | 98e3153fa3a190df5c0a2173e134f81299606819 (diff) | |
| parent | 6202e2fede75df92cbc374a3f7d6893d0c5ac721 (diff) | |
| download | ffmpeg-1117d6f4b122aa4189c27e3568154e029dfdcbe7.tar.gz | |
Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721':
indeo4: Rework stream analysis report
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/ivi.h')
| -rw-r--r-- | libavcodec/ivi.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/ivi.h b/libavcodec/ivi.h index abe43462a1..6969d6e7b6 100644 --- a/libavcodec/ivi.h +++ b/libavcodec/ivi.h @@ -47,7 +47,6 @@ enum { }; #define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes -#define IVI4_STREAM_ANALYSER 0 #define IVI5_IS_PROTECTED 0x20 /** @@ -250,13 +249,12 @@ typedef struct IVI45DecContext { uint8_t gop_flags; uint32_t lock_word; -#if IVI4_STREAM_ANALYSER + int show_indeo4_info; uint8_t has_b_frames; uint8_t has_transp; uint8_t uses_tiling; uint8_t uses_haar; uint8_t uses_fullpel; -#endif int (*decode_pic_hdr) (struct IVI45DecContext *ctx, AVCodecContext *avctx); int (*decode_band_hdr) (struct IVI45DecContext *ctx, IVIBandDesc *band, AVCodecContext *avctx); |