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
..
2012-09-06 11:27:22 +02:00
2012-09-22 03:17:28 +02:00
2012-07-15 15:07:03 +02:00
2012-08-18 10:19:05 +02:00
2012-09-11 18:58:19 +02:00
2012-09-18 14:45:44 +02:00
2012-08-16 16:20:30 +02:00
2012-09-13 12:05:19 +02:00
2012-09-05 14:33:32 +02:00
2012-07-09 22:40:12 +02:00
2012-08-17 18:26:39 +02:00
2012-09-07 13:50:24 +02:00
2012-08-29 18:19:41 +02:00
2012-08-18 10:19:05 +02:00
2012-09-18 14:45:44 +02:00
2012-07-09 22:40:12 +02:00
2012-09-18 14:45:44 +02:00
2012-09-15 19:49:34 -04:00
2012-08-15 22:32:06 +03:00
2012-09-05 14:33:32 +02:00
2012-07-15 15:07:03 +02:00
2012-08-19 11:37:05 +02:00
2012-05-18 23:34:11 +02:00
2012-09-23 00:50:06 +02:00
2012-09-18 14:45:44 +02:00
2012-05-06 16:18:10 +02:00
2012-09-05 14:33:32 +02:00
2012-09-18 14:45:44 +02:00
2012-09-05 14:33:32 +02:00
2012-09-13 20:09:53 +02:00
2012-07-09 22:40:12 +02:00
2012-09-14 11:06:40 +02:00
2012-07-23 17:14:59 +02:00
2012-09-05 14:33:32 +02:00
2012-08-21 01:29:25 +02:00
2012-09-05 14:33:32 +02:00
2012-09-18 14:45:44 +02:00
2012-09-09 10:57:28 +02:00
2012-09-18 14:45:44 +02:00
2012-07-18 17:13:00 +02:00
2012-09-07 13:00:47 +02:00
2012-05-31 17:27:27 +02:00
2012-09-18 14:45:44 +02:00
2012-08-10 16:25:23 +02:00
2012-09-18 14:45:44 +02:00
2012-09-18 14:45:44 +02:00
2012-08-16 16:20:30 +02:00
2012-08-02 12:32:48 +02:00
2012-09-23 00:50:06 +02:00
2012-09-10 18:52:28 +02:00
2012-08-16 16:20:30 +02:00
2012-08-17 18:26:39 +02:00
2012-09-19 22:43:03 +02:00
2012-08-16 16:20:30 +02:00
2012-07-19 18:44:46 +02:00
2012-07-02 21:19:41 +02:00
2012-06-25 13:42:37 +02:00
2012-08-16 16:20:30 +02:00
2012-07-22 23:56:21 +02:00
2012-05-26 20:45:59 +02:00
2012-05-25 18:54:01 +02:00
2012-05-26 20:46:00 +02:00
2012-09-23 00:50:06 +02:00
2012-09-22 10:59:40 +02:00
2012-09-18 14:45:44 +02:00
2012-07-03 01:32:16 +02:00
2012-09-25 15:15:16 +02:00
2012-06-20 23:55:17 +02:00
2012-05-18 23:34:11 +02:00
2012-09-23 00:50:06 +02:00
2012-07-22 23:56:21 +02:00
2012-08-17 18:26:40 +02:00
2012-08-16 16:20:30 +02:00
2012-09-16 02:59:43 +02:00
2012-08-02 12:32:48 +02:00
2012-08-18 10:19:05 +02:00
2012-08-16 16:20:30 +02:00
2012-09-09 10:57:28 +02:00
2012-09-07 18:24:43 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-08-31 16:04:37 +02:00
2012-09-05 14:33:32 +02:00
2012-08-17 18:26:40 +02:00
2012-08-17 18:26:40 +02:00
2012-09-05 14:33:32 +02:00
2012-08-20 23:12:34 +02:00
2012-09-05 14:33:32 +02:00
2012-08-17 18:26:41 +02:00
2012-08-16 16:20:30 +02:00
2012-08-18 10:19:05 +02:00
2012-08-30 05:09:15 +02:00
2012-09-18 14:45:44 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-09-22 03:17:28 +02:00
2012-09-23 00:46:33 +02:00
2012-09-07 20:08:12 +02:00
2012-08-17 17:06:52 +02:00
2012-08-31 23:27:21 +02:00
2012-09-06 11:27:22 +02:00
2012-08-16 16:20:30 +02:00
2012-09-05 14:33:32 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-08-17 18:26:41 +02:00
2012-09-05 18:31:18 +02:00
2012-09-20 18:45:47 +02:00
2012-07-22 23:56:21 +02:00
2012-08-16 16:20:30 +02:00
2012-08-16 16:20:30 +02:00
2012-08-28 19:48:16 +02:00
2012-07-22 23:56:21 +02:00
2012-07-22 23:56:21 +02:00
2012-08-17 18:26:42 +02:00
2012-08-01 12:23:48 +02:00
2012-09-06 00:40:01 +02:00
2012-09-04 11:39:23 +02:00
2012-07-22 23:56:21 +02:00
2012-08-16 16:20:30 +02:00
2012-09-10 14:06:20 +02:00
2012-09-13 20:09:53 +02:00
2012-07-29 23:04:49 +02:00
2012-09-18 14:45:44 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-05 14:33:32 +02:00
2012-09-21 03:00:15 +02:00
2012-08-10 00:08:34 +02:00