Michael Niedermayer
de31814ab0
Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6' ...
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6':
avio: introduce avio_closep
mpegtsenc: set muxing type notification to verbose
vc1dec: Use correct spelling of "opposite"
a64multienc: change mc_frame_counter to unsigned
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
svq1: Drop a bunch of useless parentheses
parseutils-test: do not print numerical error codes
svq1: K&R formatting cosmetics
Conflicts:
doc/APIchanges
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavformat/version.h
libavutil/parseutils.c
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11 14:03:12 +02:00
2012-05-05 22:04:21 +01:00
2012-06-08 13:14:38 -04:00
2012-06-08 13:14:38 -04:00
2012-09-20 17:07:18 +01:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2012-09-16 19:06:11 +02:00
2012-04-22 22:26:42 +02:00
2012-06-08 23:59:09 +02:00
2012-03-13 01:56:33 +01:00
2012-10-03 13:35:02 +02:00
2012-10-03 13:35:02 +02:00
2012-04-22 22:26:55 +02:00
2012-04-22 22:26:55 +02:00
2012-09-09 03:55:56 +02:00
2012-07-18 22:34:48 +02:00
2012-06-08 23:59:09 +02:00
2012-10-03 13:35:02 +02:00
2012-06-08 23:59:09 +02:00
2012-07-19 18:44:46 +02:00
2012-07-01 22:43:09 +02:00
2012-04-22 22:26:42 +02:00
2012-07-01 22:43:09 +02:00
2012-09-16 14:55:00 +02:00
2012-09-16 14:55:00 +02:00
2012-04-22 22:26:42 +02:00
2012-10-03 13:35:02 +02:00
2012-06-08 23:59:09 +02:00
2012-09-26 17:31:25 +02:00
2012-08-07 13:31:40 +02:00
2012-08-01 23:33:06 +02:00
2012-10-03 13:35:02 +02:00
2012-08-07 22:45:46 +02:00
2012-06-08 23:59:09 +02:00
2012-10-03 13:35:02 +02:00
2012-06-08 13:14:38 -04:00
2012-10-10 15:28:50 +02:00
2012-10-02 19:47:56 +01:00
2012-10-03 13:35:02 +02:00
2012-06-08 13:14:38 -04:00
2012-04-22 12:30:45 +01:00
2012-04-22 22:26:42 +02:00
2012-03-13 01:56:33 +01:00
2012-08-01 23:33:06 +02:00
2012-10-06 04:45:57 +02:00
2012-06-08 23:59:09 +02:00
2012-10-03 13:35:02 +02:00
2012-10-11 14:03:12 +02:00
2012-06-08 13:14:38 -04:00
2012-10-11 14:03:12 +02:00
2012-06-08 13:14:38 -04:00
2012-04-22 12:30:45 +01:00
2012-07-01 11:25:06 +01:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-08-01 23:33:06 +02:00
2012-10-03 13:35:02 +02:00
2012-07-18 22:34:48 +02:00
2012-07-18 22:34:48 +02:00
2012-09-21 14:44:32 +02:00
2012-08-04 00:59:14 +01:00
2012-04-26 22:24:58 +02:00
2012-04-25 21:41:39 +01:00
2012-04-25 21:41:39 +01:00
2012-06-08 23:59:09 +02:00
2012-04-25 21:41:39 +01:00
2012-08-04 23:51:43 +02:00
2012-08-07 22:45:46 +02:00
2012-06-08 23:59:09 +02:00
de31814ab0