diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 14:16:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 14:16:52 +0200 |
| commit | 25e4ec6aa14d5e9f2aebc87e1f076c4669f2e1f7 (patch) | |
| tree | bc72f44369a2f248ed136aad95d9d40ee8f085b8 /libavformat/qtpalette.h | |
| parent | 606a30c5a11522130658e0807b340ce922a390a6 (diff) | |
| parent | 60198742ff851f11a3757c713fc75a9c19b88566 (diff) | |
| download | ffmpeg-25e4ec6aa14d5e9f2aebc87e1f076c4669f2e1f7.tar.gz | |
Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'
* commit '60198742ff851f11a3757c713fc75a9c19b88566':
movenc: fix detection of 64bit offset requirement
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/qtpalette.h')
0 files changed, 0 insertions, 0 deletions