Michael Niedermayer
4d941eac16
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040' ...
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
avformat: clarify stream id for muxing
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
ppc: do not pass redundant compiler flags
avutil: change GET_UTF8 to not use av_log2()
segment: fix NULL pointer dereference in seg_write_header()
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:12:25 +01:00
2012-11-15 11:12:25 +01:00
2012-10-31 20:01:08 +01:00
2012-10-30 13:52:03 +01:00
2012-10-20 21:10:21 +02:00
2012-11-14 15:09:59 +01:00
2012-10-18 13:12:28 +01:00
2012-11-14 15:09:59 +01:00
2012-11-14 15:09:59 +01:00
2012-11-14 15:09:59 +01:00
2012-11-04 19:11:26 +00:00
2012-11-13 09:16:26 +01:00
2012-11-05 11:22:53 +00:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-07-20 10:17:25 +02:00
2012-11-06 16:18:30 +00:00
2012-05-19 14:30:41 +01:00
2012-05-19 14:30:41 +01:00
2012-05-20 10:21:52 +02:00
2012-09-22 09:34:56 +02:00
2012-05-09 14:13:34 +01:00
2012-10-22 23:13:54 +02:00
2012-11-05 15:32:30 -05:00
2012-07-02 23:18:04 +02:00
2012-10-15 08:32:34 +02:00
2012-10-18 13:12:28 +01:00
2012-10-23 10:52:15 +02:00
2012-10-23 10:28:40 +02:00
2012-10-13 15:42:49 +02:00
2012-10-09 08:48:36 +00:00
2012-10-19 14:15:47 +02:00
2012-10-23 02:19:38 +02:00
2012-10-20 12:37:52 +02:00
2012-09-10 00:07:24 +01:00
2012-10-18 13:12:28 +01:00
2012-06-30 13:49:43 +02:00
2012-05-27 15:42:55 +02:00
2012-08-04 09:49:30 +02:00
2012-05-20 10:21:52 +02:00
2012-10-19 14:15:47 +02:00
2012-05-19 14:30:41 +01:00
2012-10-10 14:13:51 +02:00
2012-10-19 13:58:14 +02:00
2012-10-21 17:01:01 +02:00
2012-10-20 12:37:52 +02:00
2012-09-01 01:54:40 +02:00
2012-10-18 11:01:53 +02:00
2012-11-05 02:20:52 +01:00
2012-10-10 14:13:51 +02:00
2012-06-18 11:47:08 +01:00
2012-05-27 15:42:55 +02:00
2012-10-19 13:47:47 +02:00
2012-10-23 10:28:40 +02:00
2012-10-23 10:28:40 +02:00
4d941eac16