diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 14:17:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-17 14:17:55 +0200 |
| commit | d6e87190fd0725f3517493f67dca6f8f264bb370 (patch) | |
| tree | 05a0a27c98a183c9210a0233860702a90701d977 /libavutil/dict.h | |
| parent | 1ade37ae9c2b1e4e68948af2474698ad45d504f4 (diff) | |
| parent | a25d912dca9cd553440167e0476c47581359c0fc (diff) | |
| download | ffmpeg-d6e87190fd0725f3517493f67dca6f8f264bb370.tar.gz | |
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>
Diffstat (limited to 'libavutil/dict.h')
0 files changed, 0 insertions, 0 deletions