diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-11-29 19:28:15 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-30 20:34:45 +0100 |
| commit | c3f9ebf74371b63fba0e7491e61904bbd165cd0f (patch) | |
| tree | cad6d000dccf25ecea1db16f1befb17f79d13c33 /libavformat/smacker.c | |
| parent | 06d7325ab1fcc009f0183be3a0b0504f6d99edfb (diff) | |
| download | ffmpeg-c3f9ebf74371b63fba0e7491e61904bbd165cd0f.tar.gz | |
lavf: make av_set_pts_info private.
It's supposed to be called only from (de)muxers.
Diffstat (limited to 'libavformat/smacker.c')
| -rw-r--r-- | libavformat/smacker.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 279d58626d..770f5364d3 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -26,6 +26,7 @@ #include "libavutil/bswap.h" #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" #define SMACKER_PAL 0x01 #define SMACKER_FLAG_RING_FRAME 0x01 @@ -171,7 +172,7 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) smk->pts_inc *= 100; tbase = 100000; av_reduce(&tbase, &smk->pts_inc, tbase, smk->pts_inc, (1UL<<31)-1); - av_set_pts_info(st, 33, smk->pts_inc, tbase); + avpriv_set_pts_info(st, 33, smk->pts_inc, tbase); st->duration = smk->frames; /* handle possible audio streams */ for(i = 0; i < 7; i++) { @@ -195,7 +196,7 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8; if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == CODEC_ID_PCM_U8) ast[i]->codec->codec_id = CODEC_ID_PCM_S16LE; - av_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate + avpriv_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate * ast[i]->codec->channels * ast[i]->codec->bits_per_coded_sample / 8); } } |