diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:45:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 11:45:45 +0200 |
| commit | 0efbd98e233194659d6ff47e871924d0756539b5 (patch) | |
| tree | 0fef16d3e187bee03dd4f71cc1d73cfcf2ea8a2b /COPYING.LGPLv3 | |
| parent | 70025c07a70334756b429f2892ee9ee9bbec119f (diff) | |
| parent | 4d7aeff9a1080e64125f3374d993b2c9c4c2751b (diff) | |
| download | ffmpeg-0efbd98e233194659d6ff47e871924d0756539b5.tar.gz | |
Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'
* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b':
flvenc: Don't pretend to support muxing "plain" VP6
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv3')
0 files changed, 0 insertions, 0 deletions