diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 00:50:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 00:57:04 +0200 |
| commit | 8469c73576f76a3390cd93455cc4b2fea1d29154 (patch) | |
| tree | 3acabb0f5ea951c3003f0940152c00bcd646221f /COPYING.GPLv2 | |
| parent | 9a2850c26af8fbf4766fd6d6795c6687eab44bbc (diff) | |
| parent | 182d3f8221c23716ea4eafa460bdb94968f71f26 (diff) | |
| download | ffmpeg-8469c73576f76a3390cd93455cc4b2fea1d29154.tar.gz | |
Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'
* commit '182d3f8221c23716ea4eafa460bdb94968f71f26':
output example: rewrite encoding logic
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions