• Michael Niedermayer's avatar
    Merge commit 'a25d912d' · d6e87190
    Michael Niedermayer authored
    * commit 'a25d912d':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d6e87190
Name
Last commit
Last update
..
aac.mak Loading commit data...
ac3.mak Loading commit data...
acodec.mak Loading commit data...
adpcm.mak Loading commit data...
alac.mak Loading commit data...
als.mak Loading commit data...
amrnb.mak Loading commit data...
amrwb.mak Loading commit data...
atrac.mak Loading commit data...
audio.mak Loading commit data...
bmp.mak Loading commit data...
cdxl.mak Loading commit data...
cover-art.mak Loading commit data...
dct.mak Loading commit data...
demux.mak Loading commit data...
dfa.mak Loading commit data...
dpcm.mak Loading commit data...
ea.mak Loading commit data...
ffprobe.mak Loading commit data...
fft.mak Loading commit data...
filter.mak Loading commit data...
flac.mak Loading commit data...
h264.mak Loading commit data...
image.mak Loading commit data...
indeo.mak Loading commit data...
libavcodec.mak Loading commit data...
libavformat.mak Loading commit data...
libavutil.mak Loading commit data...
lossless-audio.mak Loading commit data...
lossless-video.mak Loading commit data...
mapchan.mak Loading commit data...
microsoft.mak Loading commit data...
mp3.mak Loading commit data...
mpc.mak Loading commit data...
options.mak Loading commit data...
pcm.mak Loading commit data...
probe.mak Loading commit data...
prores.mak Loading commit data...
qt.mak Loading commit data...
qtrle.mak Loading commit data...
real.mak Loading commit data...
screen.mak Loading commit data...
subtitles.mak Loading commit data...
utvideo.mak Loading commit data...
vcodec.mak Loading commit data...
video.mak Loading commit data...
voice.mak Loading commit data...
vorbis.mak Loading commit data...
vpx.mak Loading commit data...
vqf.mak Loading commit data...
wavpack.mak Loading commit data...
wma.mak Loading commit data...