diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 11:43:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 11:43:32 +0200 |
| commit | 018e0db5eff21d2b7e546bc63f4807dea782d00d (patch) | |
| tree | e31a5976d3ff3f89d8403e6b8c475f97bcebd702 /libavcodec/s3tc.h | |
| parent | c6b425896541c6cc0b58c1aceb8821333f4049bc (diff) | |
| parent | 09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9 (diff) | |
| download | ffmpeg-018e0db5eff21d2b7e546bc63f4807dea782d00d.tar.gz | |
Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'
* commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9':
asfenc: remember send time and offset of the index entries
Conflicts:
libavformat/asfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/s3tc.h')
0 files changed, 0 insertions, 0 deletions