diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:40:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 15:53:23 +0200 |
| commit | 862120f98049dc4bd0919d431a4f07a64fab77ec (patch) | |
| tree | 673da894922c63ef3ec8fc25674e77697e09cad3 /libavfilter/af_amix.c | |
| parent | a87685d8e8c13b6339412f99f08a419681e5ced5 (diff) | |
| parent | 383136264ef40452efd86cafb2d7221cd3830b3d (diff) | |
| download | ffmpeg-862120f98049dc4bd0919d431a4f07a64fab77ec.tar.gz | |
Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'
* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
avconv: do not use the stream codec context for encoding
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amix.c')
0 files changed, 0 insertions, 0 deletions