• 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
ffm.h 1.73 KB