diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-02-21 19:33:07 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-02-28 00:16:33 +0100 |
| commit | 6cc12353a88dfb21c4c5a38e6c83280483b0ec88 (patch) | |
| tree | cc921e1cdff0ca70dbfaaedb08b3cd3f4e7f0a1f /libavformat | |
| parent | 2ecf564f94f8b638d73e957eb9594a9b781e2028 (diff) | |
lavf/concatdec: define "ffcat" and "ffconcat" extensions
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/concatdec.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 2858befa3d..052b4eb64f 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -289,4 +289,5 @@ AVInputFormat ff_concat_demuxer = { .read_packet = concat_read_packet, .read_close = concat_read_close, .priv_class = &concat_class, + .extensions = "ffconcat,ffcat", }; diff --git a/libavformat/version.h b/libavformat/version.h index ec907dda4e..2136e3f415 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 54 #define LIBAVFORMAT_VERSION_MINOR 63 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |