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)
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
  avconv: Apply codec options to streams that are copied as well

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

diff --cc ffmpeg.c
Simple merge
diff --cc ffmpeg_opt.c
Simple merge