1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
Michael Niedermayer 2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 19:12:03 +01:00
..
2012-12-01 00:30:11 +01:00
2012-12-16 10:41:00 +00:00
2013-01-01 17:03:22 +00:00
2013-01-22 20:27:05 +01:00
2013-02-09 20:50:11 +01:00
2012-12-30 23:37:14 +01:00
2012-12-04 11:25:46 +00:00
2012-12-04 11:25:46 +00:00
2012-12-04 11:25:46 +00:00
2013-01-30 22:17:52 +00:00
2012-12-05 12:40:57 +00:00
2012-12-16 16:53:01 +01:00
2013-02-22 13:52:43 +00:00
2013-01-01 19:29:04 +01:00
2012-12-05 20:18:04 +00:00
2013-01-24 15:02:44 +00:00
2012-12-05 13:01:22 +00:00
2013-01-24 15:02:44 +00:00
2012-12-21 00:18:34 +01:00
2013-03-05 01:39:50 +01:00
2013-01-25 00:04:22 +01:00
2012-12-05 13:01:22 +00:00
2012-12-05 13:01:22 +00:00
2013-01-07 11:43:20 +00:00
2013-01-17 04:55:14 +01:00
2013-02-21 22:24:26 +01:00
2013-02-21 00:59:32 +01:00
2013-03-08 07:32:11 +01:00
2013-01-04 20:58:59 +01:00
2012-12-30 23:09:49 +01:00
2012-12-29 18:56:33 +01:00
2012-12-23 21:22:43 +00:00
2013-01-15 20:19:28 +01:00
2013-01-07 11:43:20 +00:00
2012-12-24 02:51:51 +01:00
2012-12-23 16:08:10 +01:00
2013-02-23 17:24:15 +01:00
2012-12-17 01:53:35 +01:00
2012-12-17 13:34:30 +01:00
2012-12-06 18:06:52 +00:00
2012-12-28 21:50:42 +00:00
2012-12-28 21:58:03 +00:00
2013-01-06 18:48:51 +01:00
2013-01-06 18:48:51 +01:00
2013-01-03 07:25:47 +01:00
2012-12-09 22:01:00 +00:00
2013-02-09 20:50:11 +01:00
2012-12-16 10:27:54 +00:00
2013-01-07 10:08:38 +00:00
2013-01-07 10:08:38 +00:00
2013-01-07 10:08:38 +00:00
2013-02-13 17:36:55 +00:00
2012-12-21 00:18:34 +01:00
2013-01-20 20:59:30 +01:00
2013-01-07 23:14:58 +11:00
2012-12-21 00:18:34 +01:00
2013-01-07 13:25:20 +01:00
2012-12-21 21:18:12 +01:00