History

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.

Martin Storsjö committed 14 years ago

Commit 9f9c45f1 parent 6cb28821 file · +1 −1Browse files

Unified · Split

libavformat/movenc.c+1−1
@@ -2757,7 +2757,7 @@ static int mov_write_header(AVFormatContext *s) · 2756 unmodified lines
2757 }2757 }
2758 /* set audio_vbr for compressed audio */2758 /* set audio_vbr for compressed audio */
2759 if (av_get_bits_per_sample(st->codec->codec_id) < 8) {2759 if (av_get_bits_per_sample(st->codec->codec_id) < 8) {
2760 if (!st->codec->frame_size) {2760 if (!st->codec->frame_size && track->mode == MODE_MOV) {
2761 av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);2761 av_log(s, AV_LOG_ERROR, "track %d: codec frame size is not set\n", i);
2762 goto error;2762 goto error;
2763 }2763 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t