Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 11:55:23 +0000 (12:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Mar 2013 11:57:17 +0000 (12:57 +0100)
commit41401773d3c2f745605a2a306968b281fdec34bd
treef0bc1d3c9a58d1d3b5e3c37b8e847d70e8b1bdd8
parent46f4b468e2102467aadf5b91e44b8a0607202ee2
parentdf0229a7caa124dcfb84c34b48d316744c467311
Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'

* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
  avconv: Apply codec options to streams that are copied as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg_opt.c