virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

svq1: replace struct svq1_frame_size with an array.

Browse Source 
It is used as an array in svq1enc, so this is more correct.
This commit is contained in:
Anton Khirnov 2013-01-26 21:10:54 +01:00
parent 99162f8d46
commit 6ed9fc44ba
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/svq1.c
View File

@ -37,7 +37,7 @@
#include "svq1_vlc.h" #include "svq1_vlc.h"
/* standard video sizes */ /* 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 }, { 160, 120 }, { 128, 96 }, { 176, 144 }, { 352, 288 },
{ 704, 576 }, { 240, 180 }, { 320, 240 } { 704, 576 }, { 240, 180 }, { 320, 240 }
}; };

7
libavcodec/svq1.h
View File

@ -42,11 +42,6 @@
#define SVQ1_BLOCK_INTER_4V 2 #define SVQ1_BLOCK_INTER_4V 2
#define SVQ1_BLOCK_INTRA 3 #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, uint16_t ff_svq1_packet_checksum(const uint8_t *data,
const int length, int value); 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_intra_mean_vlc[256][2];
extern const uint16_t ff_svq1_inter_mean_vlc[512][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 */ #endif /* AVCODEC_SVQ1_H */

4
libavcodec/svq1dec.c
View File

@ -579,8 +579,8 @@ static int svq1_decode_frame_header(AVCodecContext *avctx, AVFrame *frame)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else { } else {
/* get width, height from table */ /* get width, height from table */
s->width = ff_svq1_frame_size_table[frame_size_code].width; s->width = ff_svq1_frame_size_table[frame_size_code][0];
s->height = ff_svq1_frame_size_table[frame_size_code].height; s->height = ff_svq1_frame_size_table[frame_size_code][1];
} }
} }