[SCM] libav/experimental: removed unneeded mallocs
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:35:06 UTC 2013
The following commit has been merged in the experimental branch:
commit a48835b9fe2d5606a8f0ab56b905047b2a17e42c
Author: Fabrice Bellard <fabrice at bellard.org>
Date: Sat Jan 25 13:05:39 2003 +0000
removed unneeded mallocs
Originally committed as revision 1508 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/ogg.c b/libavformat/ogg.c
index 7c7c96c..8997c18 100644
--- a/libavformat/ogg.c
+++ b/libavformat/ogg.c
@@ -30,8 +30,9 @@ typedef struct OggContext {
} OggContext ;
-static int ogg_write_header(AVFormatContext *avfcontext) {
- OggContext *context ;
+static int ogg_write_header(AVFormatContext *avfcontext)
+{
+ OggContext *context = avfcontext->priv_data;
AVCodecContext *avccontext ;
vorbis_info vi ;
vorbis_dsp_state vd ;
@@ -40,10 +41,6 @@ static int ogg_write_header(AVFormatContext *avfcontext) {
ogg_packet header, header_comm, header_code ;
int n ;
- if(!(context = malloc(sizeof(OggContext))))
- return -1 ;
- avfcontext->priv_data = context ;
-
srand(time(NULL));
ogg_stream_init(&context->os, rand());
@@ -190,17 +187,11 @@ static int next_packet(AVFormatContext *avfcontext, ogg_packet *op) {
static int ogg_read_header(AVFormatContext *avfcontext, AVFormatParameters *ap)
{
- OggContext *context ;
+ OggContext *context = avfcontext->priv_data;
char *buf ;
ogg_page og ;
AVStream *ast ;
- if(!(context = malloc(sizeof(OggContext)))) {
- perror("malloc") ;
- return -1 ;
- }
- avfcontext->priv_data = context ;
-
ogg_sync_init(&context->oy) ;
buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list