Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 19:55:11 +0000 (21:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 19:55:11 +0000 (21:55 +0200)
commit8eb1174a9ed35ba2735ec6874b0da87052185c9d
tree2a2689ca15472e658e5294f82bbd95c158e7ff84
parentc9083d85df460dd4661cdcd7d70fa7cb7b45a352
parent294daf71a7a1303b5ddd3cbefebed3b732d610f3
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>
doc/examples/muxing.c