virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

* fixing a memory leak in DV format.

Browse Source 
Patch by Brian Brice bbrice at newtek dot com

Originally committed as revision 6945 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Brian Brice 2006-11-08 18:57:02 +00:00 committed by Roman Shaposhnik
parent 9df5ea29f3
commit 0008afc59c
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/dvenc.c
View File

@ -279,7 +279,7 @@ int dv_assemble_frame(DVMuxContext *c, AVStream* st,
DVMuxContext* dv_init_mux(AVFormatContext* s) DVMuxContext* dv_init_mux(AVFormatContext* s)
{ {
DVMuxContext *c; DVMuxContext *c = (DVMuxContext *)s->priv_data;
AVStream *vst = NULL; AVStream *vst = NULL;
int i; int i;
@ -287,10 +287,6 @@ DVMuxContext* dv_init_mux(AVFormatContext* s)
if (s->nb_streams > 3) if (s->nb_streams > 3)
return NULL; return NULL;
c = av_mallocz(sizeof(DVMuxContext));
if (!c)
return NULL;
c->n_ast = 0; c->n_ast = 0;
c->ast[0] = c->ast[1] = NULL; c->ast[0] = c->ast[1] = NULL;
@ -345,7 +341,6 @@ DVMuxContext* dv_init_mux(AVFormatContext* s)
return c; return c;
bail_out: bail_out:
av_free(c);
return NULL; return NULL;
} }
@ -359,8 +354,7 @@ void dv_delete_mux(DVMuxContext *c)
#ifdef CONFIG_MUXERS #ifdef CONFIG_MUXERS
static int dv_write_header(AVFormatContext *s) static int dv_write_header(AVFormatContext *s)
{ {
s->priv_data = dv_init_mux(s); if (!dv_init_mux(s)) {
if (!s->priv_data) {
av_log(s, AV_LOG_ERROR, "Can't initialize DV format!\n" av_log(s, AV_LOG_ERROR, "Can't initialize DV format!\n"
"Make sure that you supply exactly two streams:\n" "Make sure that you supply exactly two streams:\n"
" video: 25fps or 29.97fps, audio: 2ch/48Khz/PCM\n" " video: 25fps or 29.97fps, audio: 2ch/48Khz/PCM\n"