diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:57:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:58:58 +0200 |
| commit | c2555bcbd147d068c47363ba294e9c21cfceb6c7 (patch) | |
| tree | 8f33502e4fcdc2eda1c57c82e15154f3f65f9ee9 /libavformat/isom.c | |
| parent | 0efbd98e233194659d6ff47e871924d0756539b5 (diff) | |
| parent | be1e1373d267bae2af8a62d79eef736736f24565 (diff) | |
| download | ffmpeg-c2555bcbd147d068c47363ba294e9c21cfceb6c7.tar.gz | |
Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'
* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
flvenc: Support muxing VP6A as well
Conflicts:
libavformat/flvenc.c
See: 42ae83c196d5747e8a87772a50a02a7b3f2855c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.c')
0 files changed, 0 insertions, 0 deletions