[SCM] libav/experimental: flacdec: Allocate buffers right after STREAMINFO is parsed.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:40:30 UTC 2013
The following commit has been merged in the experimental branch:
commit 239b961fbf7e01c58e4bf7df8271d1cbff0417d4
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Wed Mar 4 00:21:46 2009 +0000
flacdec: Allocate buffers right after STREAMINFO is parsed.
Originally committed as revision 17794 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 0787833..02f1b36 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -250,6 +250,7 @@ static int metadata_parse(FLACContext *s)
if (!s->got_streaminfo) {
ff_flac_parse_streaminfo(s->avctx, (FLACStreaminfo *)s,
s->gb.buffer+get_bits_count(&s->gb)/8);
+ allocate_buffers(s);
s->got_streaminfo = 1;
}
default:
@@ -259,8 +260,6 @@ static int metadata_parse(FLACContext *s)
}
} while (!metadata_last);
- if (s->got_streaminfo)
- allocate_buffers(s);
return 1;
}
return 0;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list