diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 17:21:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 17:21:36 +0100 |
| commit | c96a44d0ddb063cf5c3d5b4fb2e46d3ca2309ba0 (patch) | |
| tree | 89187f067277e30e8b87ab20dcbcc2b790edf1f7 /libswresample/swresample_internal.h | |
| parent | 5241f900581480030e2f2ac47010f86f7ee4f9fd (diff) | |
| parent | 0a6664706168dc1049967bec311970d720581625 (diff) | |
| download | ffmpeg-c96a44d0ddb063cf5c3d5b4fb2e46d3ca2309ba0.tar.gz | |
Merge commit '0a6664706168dc1049967bec311970d720581625'
* commit '0a6664706168dc1049967bec311970d720581625':
mpegvideo_enc: factor out denominator and explicitly cast operands
Conflicts:
libavcodec/mpegvideo_enc.c
See: c753b56b4d56724284dd7ed972efdb843db80f12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample_internal.h')
0 files changed, 0 insertions, 0 deletions