[FFmpeg-cvslog] avformat/astenc: avoid using AVCodecContext.frame_number

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  5 16:46:47 2014 +0200| [47550e62bf717ed626b652bd3797fcae0ca8c335] | committer: Michael Niedermayer

avformat/astenc: avoid using AVCodecContext.frame_number

Theres no gurantee that the user application has initialized it

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

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

 libavformat/astenc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/astenc.c b/libavformat/astenc.c
index edd802c..cf7a12c 100644
--- a/libavformat/astenc.c
+++ b/libavformat/astenc.c
@@ -113,7 +113,7 @@ static int ast_write_packet(AVFormatContext *s, AVPacket *pkt)
     AVCodecContext *enc = s->streams[0]->codec;
     int size = pkt->size / enc->channels;
 
-    if (enc->frame_number == 1)
+    if (s->streams[0]->nb_frames == 0)
         ast->fbs = size;
 
     ffio_wfourcc(pb, "BLCK");
@@ -135,7 +135,7 @@ static int ast_write_trailer(AVFormatContext *s)
     ASTMuxContext *ast = s->priv_data;
     AVCodecContext *enc = s->streams[0]->codec;
     int64_t file_size = avio_tell(pb);
-    int64_t samples = (file_size - 64 - (32 * enc->frame_number)) / enc->block_align; /* PCM_S16BE_PLANAR */
+    int64_t samples = (file_size - 64 - (32 * s->streams[0]->nb_frames)) / enc->block_align; /* PCM_S16BE_PLANAR */
 
     av_log(s, AV_LOG_DEBUG, "total samples: %"PRId64"\n", samples);