diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:42:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:48:56 +0200 |
| commit | b4fe41c981de403a65cdf62eac23dd38234d5562 (patch) | |
| tree | d61e24dd97345ffde00cd76ec80f1b06fc295c8e /libavformat/cdxl.c | |
| parent | 10336ca6400a789e221027923c03400c102e50b9 (diff) | |
| parent | b6293e2798afab60596a87010b6163fcb4ca3086 (diff) | |
| download | ffmpeg-b4fe41c981de403a65cdf62eac23dd38234d5562.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fmtconvert: Explicitly use int32_t instead of int
Conflicts:
libavcodec/ac3dec.c
libavcodec/fmtconvert.c
libavcodec/fmtconvert.h
See: f49564c6075935443323abf4571a62205e7b3c59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cdxl.c')
0 files changed, 0 insertions, 0 deletions