diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 10:19:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-30 10:19:20 +0200 |
| commit | ef1544740e023c26d93f9b11904ad1725139d5e7 (patch) | |
| tree | 49289442c633f7495a778ae27b92bdf25a2a5dc8 /arch.mak | |
| parent | 4971551fd215b8c7e9f3e20fc1536bb2150c84b4 (diff) | |
| parent | a2b7eeeb06471979ee39fd3075a04633222678a6 (diff) | |
| download | android_external_ffmpeg-ef1544740e023c26d93f9b11904ad1725139d5e7.tar.gz android_external_ffmpeg-ef1544740e023c26d93f9b11904ad1725139d5e7.tar.bz2 android_external_ffmpeg-ef1544740e023c26d93f9b11904ad1725139d5e7.zip | |
Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'
* commit 'a2b7eeeb06471979ee39fd3075a04633222678a6':
hlsproto: Store all durations in AV_TIME_BASE
Conflicts:
libavformat/hlsproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions