diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 21:34:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-24 21:34:54 +0200 |
| commit | 244682dd086233b71e885d2fb1ec0dd3396b94bc (patch) | |
| tree | 6a314fbc579bad35bb666ee469d28e2b2872e57c /libavformat/img2enc.c | |
| parent | 5c44c2de8045ea0b9787a95053f542b1b3b860d2 (diff) | |
| parent | 145a8096d53c20da7898539e521e6d4267ab2f09 (diff) | |
| download | ffmpeg-244682dd086233b71e885d2fb1ec0dd3396b94bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
log: Only include unistd.h if configure found it
ape: create audio stream before reading tags.
mov: make a length variable larger.
image2: Add "start_number" private option to the demuxer
image2: Add "start_number" private option to the muxer
avconv: remove a forgotten debugging printf.
avconv: use more descriptive names for hardcoded filters.
avconv: remove redundant handling of async.
doc/filters: fix typo.
h264: use asm cabac reader under a generic condition
Conflicts:
ffmpeg.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2enc.c')
| -rw-r--r-- | libavformat/img2enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 5dc7e1230f..58b4655139 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -27,6 +27,7 @@ #include "avformat.h" #include "avio_internal.h" #include "internal.h" +#include "libavutil/opt.h" typedef struct { const AVClass *class; /**< Class for private options. */ @@ -140,7 +141,6 @@ static const AVOption muxoptions[] = { { NULL }, }; - #if CONFIG_IMAGE2_MUXER static const AVClass img2mux_class = { .class_name = "image2 muxer", @@ -148,6 +148,7 @@ static const AVClass img2mux_class = { .option = muxoptions, .version = LIBAVUTIL_VERSION_INT, }; + AVOutputFormat ff_image2_muxer = { .name = "image2", .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), |