[FFmpeg-cvslog] avdevice/pulse_audio_enc: use getter function for AVFrame.channels

Michael Niedermayer git at videolan.org
Wed Jul 30 23:08:24 CEST 2014


ffmpeg | branch: release/2.3 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 28 20:06:11 2014 +0200| [de9d3f22f06edcda10903083d687ddcc039e8146] | committer: Michael Niedermayer

avdevice/pulse_audio_enc: use getter function for AVFrame.channels

This is required by the API/ABI for things outside libavutil

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1e51af13c7538f427e8a0cf0e498263de674c70e)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de9d3f22f06edcda10903083d687ddcc039e8146
---

 libavdevice/pulse_audio_enc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c
index b07d4c0..bc4d1f0 100644
--- a/libavdevice/pulse_audio_enc.c
+++ b/libavdevice/pulse_audio_enc.c
@@ -681,7 +681,7 @@ static int pulse_write_frame(AVFormatContext *h, int stream_index,
                AVERROR(EINVAL) : 0;
 
     pkt.data     = (*frame)->data[0];
-    pkt.size     = (*frame)->nb_samples * av_get_bytes_per_sample((*frame)->format) * (*frame)->channels;
+    pkt.size     = (*frame)->nb_samples * av_get_bytes_per_sample((*frame)->format) * av_frame_get_channels(*frame);
     pkt.dts      = (*frame)->pkt_dts;
     pkt.duration = av_frame_get_pkt_duration(*frame);
     return pulse_write_packet(h, &pkt);



More information about the ffmpeg-cvslog mailing list