[FFmpeg-cvslog] doc/examples/muxing: Move samples_count to OutputStream
Michael Niedermayer
git at videolan.org
Sun Jul 27 01:24:52 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 27 01:05:05 2014 +0200| [a98cadef7fe1e6fedeb916bb95dfe61161dd0034] | committer: Michael Niedermayer
doc/examples/muxing: Move samples_count to OutputStream
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a98cadef7fe1e6fedeb916bb95dfe61161dd0034
---
doc/examples/muxing.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c
index 3ab36c7..4410f82 100644
--- a/doc/examples/muxing.c
+++ b/doc/examples/muxing.c
@@ -55,6 +55,7 @@ typedef struct OutputStream {
/* pts of the next frame that will be generated */
int64_t next_pts;
+ int samples_count;
AVFrame *frame;
AVFrame *tmp_frame;
@@ -177,8 +178,6 @@ static void add_stream(OutputStream *ost, AVFormatContext *oc,
/**************************************************************/
/* audio output */
-int samples_count;
-
static void open_audio(AVFormatContext *oc, AVCodec *codec, OutputStream *ost, AVDictionary *opt_arg)
{
AVCodecContext *c;
@@ -332,8 +331,8 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost)
dst_nb_samples = frame->nb_samples;
}
- frame->pts = av_rescale_q(samples_count, (AVRational){1, c->sample_rate}, c->time_base);
- samples_count += dst_nb_samples;
+ frame->pts = av_rescale_q(ost->samples_count, (AVRational){1, c->sample_rate}, c->time_base);
+ ost->samples_count += dst_nb_samples;
}
ret = avcodec_encode_audio2(c, &pkt, frame, &got_packet);
More information about the ffmpeg-cvslog
mailing list