diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-12-27 07:46:44 +0000 |
|---|---|---|
| committer | Anton Khirnov <wyskas@gmail.com> | 2010-12-27 07:46:44 +0000 |
| commit | bb62d5c1f06e7ff0446abb9cbe6a102cdbd38cc0 (patch) | |
| tree | c0b31fbd2963a2cefa446c54b011b8e49ca550d9 /libavformat | |
| parent | 18f1add31c93940359086465825adada99bd6bc9 (diff) | |
| download | ffmpeg-bb62d5c1f06e7ff0446abb9cbe6a102cdbd38cc0.tar.gz | |
Allow output formats without any streams.
Required for future metadata format.
Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 1 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1e878819d0..4f4693555a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -323,6 +323,7 @@ typedef struct AVFormatParameters { #define AVFMT_TS_DISCONT 0x0200 /**< Format allows timestamp discontinuities. Note, muxers always require valid (monotone) timestamps */ #define AVFMT_VARIABLE_FPS 0x0400 /**< Format allows variable fps. */ #define AVFMT_NODIMENSIONS 0x0800 /**< Format does not need width/height */ +#define AVFMT_NOSTREAMS 0x1000 /**< Format does not require any streams */ typedef struct AVOutputFormat { const char *name; diff --git a/libavformat/utils.c b/libavformat/utils.c index 58e06e8688..e9a8099c95 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2709,7 +2709,7 @@ int av_write_header(AVFormatContext *s) AVStream *st; // some sanity checks - if (s->nb_streams == 0) { + if (s->nb_streams == 0 && !(s->oformat->flags & AVFMT_NOSTREAMS)) { av_log(s, AV_LOG_ERROR, "no streams\n"); return AVERROR(EINVAL); } @@ -2777,7 +2777,7 @@ int av_write_header(AVFormatContext *s) #endif /* set muxer identification string */ - if (!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { + if (s->nb_streams && !(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) { av_metadata_set2(&s->metadata, "encoder", LIBAVFORMAT_IDENT, 0); } |