Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 22:16:34 +0000 (00:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 22:16:34 +0000 (00:16 +0200)
commit9a2850c26af8fbf4766fd6d6795c6687eab44bbc
treea12bc274b126512a2bb7dadfea819283a1170f8c
parent877716a79c9d649624b67b1fa328825e2c055cc9
parenta7fcd4122b19b0f934020f4e261d0c44c4c32e11
Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'

* commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11':
  output example: store the scaling context in the stream context

Conflicts:
doc/examples/muxing.c

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