[libav-commits] movenc: Don't require frame_size to be set for modes other than mov

Martin Storsjö git at libav.org
Wed Jan 25 21:26:52 CET 2012


Module: libav
Branch: master
Commit: 9f9c45f4b635457543a3bc37b09a679daa9dabea

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Mon Jan 23 14:56:56 2012 +0200

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 at martin.st>

---

 libavformat/movenc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5e8bed2..48b474b 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;
                 }



More information about the libav-commits mailing list