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

dv: convert to new channel layout API 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-03-31 13:47:21 +02:00 committed by James Almer
parent 84f957e6b2
commit 590d9d6153
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/dv.c
View File

@ -281,8 +281,7 @@ static int dv_extract_audio_info(DVDemuxContext *c, const uint8_t *frame)
c->audio_pkt[i].pos = -1;
}
c->ast[i]->codecpar->sample_rate = dv_audio_frequency[freq];
c->ast[i]->codecpar->channels = 2;
c->ast[i]->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
c->ast[i]->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
c->ast[i]->codecpar->bit_rate = 2 * dv_audio_frequency[freq] * 16;
c->ast[i]->start_time = 0;
}

2
libavformat/dvenc.c
View File

@ -333,7 +333,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
if (c->n_ast > 1) return NULL;
/* Some checks -- DV format is very picky about its incoming streams */
if(st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE ||
st->codecpar->channels != 2)
st->codecpar->ch_layout.nb_channels != 2)
goto bail_out;
if (st->codecpar->sample_rate != 48000 &&
st->codecpar->sample_rate != 44100 &&