eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1565a9a9e90cc2fe6295b51e4cb9240247d40a30
ffmpeg/libavformat/asf.h
Michael Niedermayer 018e0db5ef 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>
2013-09-20 11:43:32 +02:00

7.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink