mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
do not use PAL_samples_per_frame in init, to make init independant
Originally committed as revision 16902 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a9025f2ae4
commit
59bcc93bb1
@ -878,7 +878,7 @@ static int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_f
|
||||
int i;
|
||||
|
||||
if (!samples_per_frame)
|
||||
samples_per_frame = PAL_samples_per_frame;
|
||||
return -1;
|
||||
|
||||
for (i = 0; i < s->nb_streams; i++) {
|
||||
AVStream *st = s->streams[i];
|
||||
@ -961,6 +961,9 @@ static int mxf_write_header(AVFormatContext *s)
|
||||
sc->order = AV_RB32(sc->track_essence_element_key+12);
|
||||
}
|
||||
|
||||
if (!samples_per_frame)
|
||||
samples_per_frame = PAL_samples_per_frame;
|
||||
|
||||
if (ff_audio_interleave_init(s, samples_per_frame) < 0)
|
||||
return -1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user