Changeset 702cf8d0 in ffmpeg
- Timestamp:
- Feb 11, 2015, 12:43:00 AM (10 years ago)
- Branches:
- master
- Children:
- b61170f5
- Parents:
- 1cca1248 (diff), 6a5b8ca4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- libavformat
- Files:
-
- 2 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libavformat/Makefile
r1cca1248 r702cf8d0 21 21 riff.o \ 22 22 sdp.o \ 23 seek.o \24 23 url.o \ 25 24 utils.o \ -
libavformat/mpegts.c
r1cca1248 r702cf8d0 35 35 #include "internal.h" 36 36 #include "avio_internal.h" 37 #include "seek.h"38 37 #include "mpeg.h" 39 38 #include "isom.h"
Note:
See TracChangeset
for help on using the changeset viewer.