1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
Michael Niedermayer 0ee905e243 Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16 23:54:10 +01:00
..
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-18 19:53:47 +02:00
2013-10-18 19:53:47 +02:00
2013-10-13 20:13:38 +00:00
2013-11-10 13:25:35 +01:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-06 19:36:53 +02:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-28 23:54:42 +01:00
2013-09-18 14:10:05 -04:00
2013-10-13 20:13:38 +00:00
2013-09-21 03:26:54 +02:00
2013-10-31 20:20:49 +01:00
2013-10-23 11:17:03 +03:00
2013-11-09 01:45:24 +01:00
2013-09-21 15:36:33 +02:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-11-13 22:56:18 +01:00
2013-10-22 17:09:56 +01:00
2013-10-22 17:09:56 +01:00
2013-10-22 17:09:56 +01:00
2013-10-22 17:09:56 +01:00
2013-10-13 20:13:38 +00:00
2013-09-21 15:36:33 +02:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-25 19:14:36 +02:00
2013-09-21 15:36:33 +02:00
2013-10-13 20:13:38 +00:00
2013-11-06 12:56:42 +01:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-21 17:32:01 +02:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-10-13 20:13:38 +00:00
2013-09-21 15:36:33 +02:00