diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 21:55:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 21:55:11 +0200 |
commit | 8eb1174a9ed35ba2735ec6874b0da87052185c9d (patch) | |
tree | 2a2689ca15472e658e5294f82bbd95c158e7ff84 /doc/examples/Makefile | |
parent | c9083d85df460dd4661cdcd7d70fa7cb7b45a352 (diff) | |
parent | 294daf71a7a1303b5ddd3cbefebed3b732d610f3 (diff) | |
download | ffmpeg-8eb1174a9ed35ba2735ec6874b0da87052185c9d.tar.gz |
Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'
* commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3':
output example: use a struct to bundle the video stream variables together
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/Makefile')
0 files changed, 0 insertions, 0 deletions