diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 04:10:28 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 04:10:28 +0400 |
| commit | 12ab07be447264b107b18bc49bb9e06be072330f (patch) | |
| tree | 7efd220c82eba3dc7779839806ac5c1b080aa520 /libavformat | |
| parent | 61b5ef7754132c43e6db1a273066e82c469fa39c (diff) | |
| parent | e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b (diff) | |
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
Alias PIX image encoder and decoder
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/img2.c | 1 | ||||
| -rw-r--r-- | libavformat/img2enc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 4fd4fd2285..183bf73c6d 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -44,6 +44,7 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_PGMYUV, "pgmyuv" }, { AV_CODEC_ID_PBM, "pbm" }, { AV_CODEC_ID_PAM, "pam" }, + { AV_CODEC_ID_ALIAS_PIX, "pix" }, { AV_CODEC_ID_MPEG1VIDEO, "mpg1-img" }, { AV_CODEC_ID_MPEG2VIDEO, "mpg2-img" }, { AV_CODEC_ID_MPEG4, "mpg4-img" }, diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index f61b0ca30b..684ed1441e 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,webp,xbm,xface", + "sunras,webp,xbm,xface,pix", .priv_data_size = sizeof(VideoMuxData), .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, |