[FFmpeg-cvslog] Remove two anonymous arrays.
Carl Eugen Hoyos
git at videolan.org
Wed Apr 17 00:54:22 CEST 2013
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Apr 17 00:37:05 2013 +0200| [fe1de12fafcefb9192eb135a472b2d859fe58082] | committer: Carl Eugen Hoyos
Remove two anonymous arrays.
Fixes compilation of pngenc.c and flvdec.c with PGC 13.4-0.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe1de12fafcefb9192eb135a472b2d859fe58082
---
libavcodec/pngenc.c | 3 ++-
libavformat/flvdec.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index a401c78..5ba5983 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -57,8 +57,9 @@ static void png_get_interlaced_row(uint8_t *dst, int row_size,
int x, mask, dst_x, j, b, bpp;
uint8_t *d;
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) {
case 1:
memset(dst, 0, row_size);
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 0bb51e0..8bb56e8 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -742,9 +742,10 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
}
}
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");
st = create_stream(s,
- (int[]){AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_DATA}[stream_type]);
+ stream_types[stream_type]);
if (!st)
return AVERROR(ENOMEM);
More information about the ffmpeg-cvslog
mailing list