Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 19:04:31 +0000 (21:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 19:04:31 +0000 (21:04 +0200)
commit1c0c19f8bd4b3469ce054a0a78bc1edba0e30689
tree34760cd51f5ab434683f054a82f2eb33ba1984d0
parent1ace9573dce509e2b25165199c3b658667860ecf
parent884f7c975f0af25febe86660e87bf3b2165a0309
Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'

* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
  output example: set the stream timebase

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/examples/muxing.c