ffmpeg | branch: master | Carl Eugen Hoyos <ceho...@ag.or.at> | Mon May 4 17:49:36 2015 +0200| [8ad04d24c82e4b59a89108c3d37095e8362788bd] | committer: Carl Eugen Hoyos
lavf/apngenc: Fix png remuxing by using default extension apng. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ad04d24c82e4b59a89108c3d37095e8362788bd --- Changelog | 2 +- libavformat/apngenc.c | 2 +- libavformat/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 623d10a..7d619b9 100644 --- a/Changelog +++ b/Changelog @@ -12,7 +12,7 @@ version <next>: - Detelecine filter - Intel QSV-accelerated H.264 encoding - MMAL-accelerated H.264 decoding -- basic APNG encoder and muxer +- basic APNG encoder and muxer with default extension "apng" - unpack DivX-style packed B-frames in MPEG-4 bitstream filter - WebM Live Chunk Muxer - nvenc level and tier options diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 4b31309..dcf6b90 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -259,7 +259,7 @@ AVOutputFormat ff_apng_muxer = { .name = "apng", .long_name = NULL_IF_CONFIG_SMALL("Animated Portable Network Graphics"), .mime_type = "image/png", - .extensions = "png", + .extensions = "apng", .priv_data_size = sizeof(APNGMuxContext), .audio_codec = AV_CODEC_ID_NONE, .video_codec = AV_CODEC_ID_APNG, diff --git a/libavformat/version.h b/libavformat/version.h index 8733dc3..976fa60 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 31 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
