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.c | |
| 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.c')
| -rw-r--r-- | libavcodec/svq1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/svq1.c b/libavcodec/svq1.c index 0c19a6d53b..c219f2221a 100644 --- a/libavcodec/svq1.c +++ b/libavcodec/svq1.c @@ -37,7 +37,7 @@ #include "svq1_vlc.h" /* standard video sizes */ -const struct svq1_frame_size ff_svq1_frame_size_table[7] = { +const uint16_t ff_svq1_frame_size_table[7][2] = { { 160, 120 }, { 128, 96 }, { 176, 144 }, { 352, 288 }, { 704, 576 }, { 240, 180 }, { 320, 240 } }; |