diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:53:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 14:53:49 +0100 |
| commit | 6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7 (patch) | |
| tree | 502e9b517e24b857069884bda22575eaf9c2779c /libavcodec/svq1.h | |
| parent | fadf845973aeb47d1b0bf3eac552394fd8a71437 (diff) | |
| parent | 238614de679a71970c20d7c3fee08a322967ec40 (diff) | |
| download | ffmpeg-6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7.tar.gz | |
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
* commit '238614de679a71970c20d7c3fee08a322967ec40':
cdgraphics: do not rely on get_buffer() initializing the frame.
svq1: replace struct svq1_frame_size with an array.
vf_yadif: silence a warning.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1.h')
| -rw-r--r-- | libavcodec/svq1.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h index 9b132e2320..8380f2256b 100644 --- a/libavcodec/svq1.h +++ b/libavcodec/svq1.h @@ -42,11 +42,6 @@ #define SVQ1_BLOCK_INTER_4V 2 #define SVQ1_BLOCK_INTRA 3 -struct svq1_frame_size { - uint16_t width; - uint16_t height; -}; - uint16_t ff_svq1_packet_checksum(const uint8_t *data, const int length, int value); @@ -59,6 +54,6 @@ extern const uint8_t ff_svq1_inter_multistage_vlc[6][8][2]; extern const uint16_t ff_svq1_intra_mean_vlc[256][2]; extern const uint16_t ff_svq1_inter_mean_vlc[512][2]; -extern const struct svq1_frame_size ff_svq1_frame_size_table[7]; +extern const uint16_t ff_svq1_frame_size_table[7][2]; #endif /* AVCODEC_SVQ1_H */ |