aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-01-23 14:56:56 +0200
committerMartin Storsjö <martin@martin.st>2012-01-25 22:25:56 +0200
commit9f9c45f4b635457543a3bc37b09a679daa9dabea (patch)
treea7eead7f45cb65c2560110afc7ebfdd7ff733e6b
parent6cb288290dcc66a405e0c226b26f31a7d248b7cd (diff)
downloadffmpeg-9f9c45f4b635457543a3bc37b09a679daa9dabea.tar.gz
movenc: Don't require frame_size to be set for modes other than mov
The field frame_size isn't written to the output anywhere except than in mov. This facilitates stream copy from formats that don't set frame_size. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/movenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5e8bed2001..48b474bfc6 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2757,7 +2757,7 @@ static int mov_write_header(AVFormatContext *s)
}
/* set audio_vbr for compressed audio */
if (av_get_bits_per_sample(st->codec->codec_id) < 8) {
- if (!st->codec->frame_size) {
+ if (!st->codec->frame_size && track->mode == MODE_MOV) {
av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);
goto error;
}