diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 21:47:26 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 21:47:26 +0100 |
| commit | bbf5ef9dac9475d8ed22da23acc2eb63a2640784 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /doc/examples/muxing.c | |
| parent | 6372c9dc9972318e75a5889ad6c52500b8294099 (diff) | |
| parent | 15e84ed3f141c586e8cb78ed58365cf5a511108a (diff) | |
| download | ffmpeg-bbf5ef9dac9475d8ed22da23acc2eb63a2640784.tar.gz | |
Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'
This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.
* commit '15e84ed3f141c586e8cb78ed58365cf5a511108a':
avconv: convert to codecpar
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions