highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove two anonymous arrays.

Browse Source 
Fixes compilation of pngenc.c and flvdec.c with PGC 13.4-0.
This commit is contained in:
Carl Eugen Hoyos 2013-04-17 00:37:05 +02:00
parent 9802f56684
commit fe1de12faf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/pngenc.c
View File

@ -57,8 +57,9 @@ static void png_get_interlaced_row(uint8_t *dst, int row_size,
int x, mask, dst_x, j, b, bpp; int x, mask, dst_x, j, b, bpp;
uint8_t *d; uint8_t *d;
const uint8_t *s; const uint8_t *s;
static const int masks[] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
mask = (int[]){0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}[pass]; mask = masks[pass];
switch(bits_per_pixel) { switch(bits_per_pixel) {
case 1: case 1:
memset(dst, 0, row_size); memset(dst, 0, row_size);

3
libavformat/flvdec.c
View File

@ -742,9 +742,10 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
} }
if(i == s->nb_streams){ if(i == s->nb_streams){
static const enum AVMediaType stream_types[] = {AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_DATA};
av_log(s, AV_LOG_WARNING, "Stream discovered after head already parsed\n"); av_log(s, AV_LOG_WARNING, "Stream discovered after head already parsed\n");
st = create_stream(s, st = create_stream(s,
(int[]){AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_DATA}[stream_type]); stream_types[stream_type]);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);