diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/internal.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 2824436286..9921ce11e0 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -326,8 +326,6 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st, AVCodecParserContext *pc, AVPacket *pkt); -int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux); - unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag); diff --git a/libavformat/utils.c b/libavformat/utils.c index 973ab94d6f..4cc246d9ee 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -454,27 +454,6 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) /**********************************************************/ /** - * Get the number of samples of an audio frame. Return -1 on error. - */ -int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux) -{ - int frame_size; - - /* give frame_size priority if demuxing */ - if (!mux && enc->frame_size > 1) - return enc->frame_size; - - if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0) - return frame_size; - - /* Fall back on using frame_size if muxing. */ - if (enc->frame_size > 1) - return enc->frame_size; - - return -1; -} - -/** * Return the frame duration in seconds. Return 0 if not available. */ void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st, @@ -509,7 +488,7 @@ void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st, } break; case AVMEDIA_TYPE_AUDIO: - frame_size = ff_get_audio_frame_size(st->codec, pkt->size, 0); + frame_size = av_get_audio_frame_duration(st->codec, pkt->size); if (frame_size <= 0 || st->codec->sample_rate <= 0) break; *pnum = frame_size; |