eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
28f303542e90bc34f96e2e04af6f1b9e9b9d65ab
ffmpeg/libavformat/hlsproto.c
Michael Niedermayer ef1544740e Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6' 
* commit 'a2b7eeeb06471979ee39fd3075a04633222678a6':
  hlsproto: Store all durations in AV_TIME_BASE

Conflicts:
	libavformat/hlsproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 10:19:20 +02:00

9.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink