diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-04 17:59:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-04 17:59:56 +0200 |
| commit | 783e94cb119052722d38df0efa248fecc53508ab (patch) | |
| tree | 325b7d3025c336b91869e87c12238267b92fab04 /libavformat | |
| parent | f320f2f4c6398404a8653b4a78134ab42dda9ea7 (diff) | |
| parent | 0bca6182b26a2094c5229fef4d8fe8ecb9a75e58 (diff) | |
| download | ffmpeg-783e94cb119052722d38df0efa248fecc53508ab.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavfi/cropdetect: Fix cropdetect for > 8 bit input.
lavf/apngenc: Fix png remuxing by using default extension apng.
lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/apngenc.c | 2 | ||||
| -rw-r--r-- | libavformat/mxfenc.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 4b31309334..dcf6b906e1 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/mxfenc.c b/libavformat/mxfenc.c index efa1e04116..59667924f0 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1640,6 +1640,8 @@ AVPacket *pkt) if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) < 0) return -1; + if ((sc->interlaced = avpriv_dnxhd_get_interlaced(cid)) < 0) + return AVERROR_INVALIDDATA; switch (cid) { case 1235: diff --git a/libavformat/version.h b/libavformat/version.h index 381c0718b6..976fa60fc8 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 100 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |