diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:21:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:21:03 +0200 |
| commit | e56f14659f580954626e8c1660771c593ecd74fa (patch) | |
| tree | c2c0eeb1f93092778165d4812316df3df2d65ff8 /libavformat/libssh.c | |
| parent | 4c7c0d37e5c2ad5b046d1f543e47850c8b94403d (diff) | |
| parent | e1319aa1c1be9b64117c19170344fb78841dd67c (diff) | |
| download | ffmpeg-e56f14659f580954626e8c1660771c593ecd74fa.tar.gz | |
Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'
* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
libx264: Add support for the MPEG2 encoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/libssh.c')
0 files changed, 0 insertions, 0 deletions