FFmpeg/libavcodec
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-10-08 02:09:28 +02:00
2012-10-09 04:00:55 +02:00
2012-09-21 01:03:31 +02:00
2012-10-13 00:31:21 +02:00
2012-10-14 05:48:02 +02:00
2012-10-12 17:58:15 +02:00
2012-09-30 14:05:04 +00:00
2012-10-14 03:42:28 +02:00
2012-10-09 16:48:43 +02:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-10-12 01:44:35 +02:00
2012-10-14 00:08:53 +02:00
2012-10-14 21:45:42 +02:00
2012-10-03 16:14:59 +02:00
2012-10-13 08:22:26 +00:00
2012-10-13 16:02:09 +00:00
2012-10-01 13:42:44 -04:00
2012-10-15 15:09:46 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-12 18:17:10 +03:00
2012-10-17 12:11:34 +00:00
2012-10-10 16:48:13 +00:00
2012-09-23 15:24:08 +02:00
2012-10-13 18:00:48 +00:00
2012-10-15 13:28:23 +00:00