1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
Michael Niedermayer 073e771c9c Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'
* commit '33c859c142ef3f49b7a6227014ad92a680cf4d74':
  lavf: ignore attachment streams for interleaving purposes

Conflicts:
	libavformat/avformat.h
	libavformat/internal.h
	libavformat/mux.c

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