diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-27 09:19:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-27 09:19:58 +0200 |
| commit | 90279285227914dabf2cd011b186d2182291363a (patch) | |
| tree | a60f50de1c7862beee6a9396fed6160000bcf375 /libavformat/assenc.c | |
| parent | e64dc86a13c051934d9d0d1fd49f65100167427c (diff) | |
| parent | 86f042dcabde2a5386dbd95ab0451b274987d253 (diff) | |
| download | ffmpeg-90279285227914dabf2cd011b186d2182291363a.tar.gz | |
Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
wtv: Make WTV_SECTOR_BITS a 64 bit constant
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/assenc.c')
0 files changed, 0 insertions, 0 deletions