Michael Niedermayer
d6e87190fd
Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'
* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
avcodec_encode_audio(): fix invalid free
pcm-mpeg: correct bitrate calculation
ffv1: K&R formatting cosmetics
fate: Add rangecoder test
network: #include stdint.h in network.h
nut: export codec_tag provided by rawvideo
avserver: move avserver-specific code from ffmdec.c to avserver.c
Conflicts:
ffserver.c
libavcodec/ffv1.c
libavformat/ffmdec.c
libavformat/nutenc.c
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 14:17:55 +02:00
..
2012-09-28 20:30:37 +02:00
2012-10-10 14:13:51 +02:00
2012-06-25 01:58:18 +02:00
2012-05-19 14:30:41 +01:00
2012-08-22 16:41:57 -04:00
2012-05-19 14:30:41 +01:00
2012-10-10 10:49:51 +02:00
2012-10-10 10:49:51 +02:00
2012-10-10 10:49:51 +02:00
2012-10-10 14:13:51 +02: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-05-09 14:13:34 +01:00
2012-07-10 00:04:24 +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-08-12 18:11:27 +02:00
2012-08-22 00:58:44 +02:00
2012-07-02 23:18:04 +02:00
2012-10-15 08:32:34 +02:00
2012-05-19 14:30:41 +01:00
2012-10-16 15:45:55 +02:00
2012-10-09 14:16:34 +03:00
2012-10-13 15:42:49 +02:00
2012-10-09 08:48:36 +00:00
2012-09-29 16:09:05 +02:00
2012-06-01 18:44:07 +02:00
2012-07-23 22:12:12 +02:00
2012-09-10 00:07:24 +01:00
2012-09-08 12:53:44 +02: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-09-29 16:09:05 +02:00
2012-05-19 14:30:41 +01:00
2012-10-10 14:13:51 +02:00
2012-09-29 16:09:05 +02:00
2012-09-23 15:24:08 +02:00
2012-09-01 01:54:40 +02:00
2012-10-11 15:46:48 +02:00
2012-09-29 16:09:05 +02: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-05-20 10:21:52 +02:00
2012-05-19 14:30:41 +01:00
2012-10-10 10:49:51 +02:00