diff options
| author | Derek Buitenhuis <[email protected]> | 2016-04-10 21:29:30 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <[email protected]> | 2016-04-10 21:29:30 +0100 |
| commit | 6372c9dc9972318e75a5889ad6c52500b8294099 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavformat/segment.c | |
| parent | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (diff) | |
| parent | 5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d (diff) | |
Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d'
This commit is a no-op. We already moved it here.
* commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d':
avconv: switch opening decoders and encoders
Merged-by: Derek Buitenhuis <[email protected]>
Diffstat (limited to 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions