RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Baptiste Coudurier 2009-01-31 10:49:26 +00:00
parent a9025f2ae4
commit 59bcc93bb1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mxfenc.c
View File

@ -878,7 +878,7 @@ static int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_f
int i; int i;
if (!samples_per_frame) if (!samples_per_frame)
samples_per_frame = PAL_samples_per_frame; return -1;
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->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); 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) if (ff_audio_interleave_init(s, samples_per_frame) < 0)
return -1; return -1;