virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-14 22:15:12 +02:00
Code Issues Releases Activity

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

Browse Source 
* commit '7751e4693dd10ec98c20fbd9887233b575034272':
  ogg: check that the expected number of headers had been parsed
  libx264: change default to closed gop to match x264cli
  Use avcodec_free_frame() to free AVFrames.
  lavf: use a malloced AVFrame in try_decode_frame().
  lavc: add avcodec_free_frame().
  lavc: ensure extended_data is set properly on decoding
  lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
  lavc: use av_mallocz to allocate AVFrames.
  lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/src_movie.c
	libavformat/oggdec.c
	libavformat/oggdec.h
	libavformat/oggparsetheora.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-09-25 13:34:06 +02:00
parent 2089f93300 7751e4693d
commit 46a35959d8
21 changed files with 125 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/examples/decoding_encoding.c
View File

@ -222,7 +222,7 @@ static void audio_encode_example(const char *filename)
fclose(f);
av_freep(&samples);
av_freep(&frame);
avcodec_free_frame(&frame);
avcodec_close(c);
av_free(c);
}
@ -320,7 +320,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)
avcodec_close(c);
av_free(c);
av_free(decoded_frame);
avcodec_free_frame(&decoded_frame);
}
/*
@ -454,7 +454,7 @@ static void video_encode_example(const char *filename, int codec_id)
avcodec_close(c);
av_free(c);
av_freep(&frame->data[0]);
av_free(frame);
avcodec_free_frame(&frame);
printf("\n");
}
@ -594,7 +594,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
avcodec_close(c);
av_free(c);
av_free(picture);
avcodec_free_frame(&picture);
printf("\n");
}