diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:16:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 12:19:35 +0200 |
| commit | 872e087305a46377b77eaedc4e90d4ab451ae7be (patch) | |
| tree | 74ccc8e37900294406d386e9270f11e9214d6ffb /doc/examples/muxing.c | |
| parent | 63001833c51c3911347ee81520066ac9690b2204 (diff) | |
| parent | 248d8fb60c59c8e044d9c8f78f23383b7cdecf72 (diff) | |
| download | ffmpeg-872e087305a46377b77eaedc4e90d4ab451ae7be.tar.gz | |
Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'
* commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72':
avplay: Use av_gettime_relative
Conflicts:
ffplay.c
See: 0ca0b4c29cf750cbb15732cddbe16723a66afda8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions