diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-03-20 01:15:25 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-03-26 23:25:02 +0100 |
| commit | e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b (patch) | |
| tree | fdd640cc95197b8b9c8ede6e80e48894c30167f8 /libavformat | |
| parent | 3b5946bccef6cd219f01d22e542ca5c6de68a7be (diff) | |
Alias PIX image encoder and decoder
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 ed592815a5..9cec45a03a 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -43,6 +43,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 f4a80aa999..13e68286a3 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -148,7 +148,7 @@ AVOutputFormat ff_image2_muxer = { .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), .extensions = "bmp,dpx,jpeg,jpg,ljpg,pam,pbm,pcx,pgm,pgmyuv,png," "ppm,sgi,tga,tif,tiff,jp2,xwd,sun,ras,rs,im1,im8,im24," - "sunras,webp,xbm,j2c", + "sunras,webp,xbm,j2c,pix", .priv_data_size = sizeof(VideoMuxData), .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, |