generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2308c5bb25
ffmpeg/doc/examples
History
Michael Niedermayer 46a35959d8 Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 
* 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>
2012-09-25 15:15:16 +02:00
..
decoding_encoding.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
demuxing.c examples/demuxing: add audio decoding/demuxing 2012-09-11 17:48:07 +02:00
filtering_audio.c avoid ambigous buffersink names 2012-09-01 06:05:08 +02:00
filtering_video.c avoid ambigous buffersink names 2012-09-01 06:05:08 +02:00
Makefile examples/scaling_video: write to rawvideo file 2012-09-04 11:29:28 +02:00
metadata.c
muxing.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
scaling_video.c examples/scaling_video: write to rawvideo file 2012-09-04 11:29:28 +02:00