diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
| commit | 6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd (patch) | |
| tree | 6d894ef0fb24a5394ce4341e2404d6668f8d23f1 /libavformat/img2enc.c | |
| parent | 9b195dd5793edb88a72d53cb080c2216e91a5849 (diff) | |
| parent | be7c323176e2e5fcf30e3d2ff20975b2f936811b (diff) | |
| download | ffmpeg-6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd.tar.gz | |
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
Add a libwebp encoder
Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2enc.c')
| -rw-r--r-- | libavformat/img2enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 3529e12c55..f61b0ca30b 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -194,7 +194,7 @@ AVOutputFormat ff_image2_muxer = { .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .extensions = "bmp,dpx,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png," "ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24," - "sunras,xbm,xface", + "sunras,webp,xbm,xface", .priv_data_size = sizeof(VideoMuxData), .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, |