diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-07-28 13:27:57 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 03:12:58 +0200 |
| commit | d92550d19129f230d534c832c5a41591682ebbf8 (patch) | |
| tree | 919756b43062a51d5e861e35e846c8e5e2f18046 /libavformat/internal.h | |
| parent | 7b59217b60cc7133766ea33ee8519efda9ec4c5c (diff) | |
| download | ffmpeg-d92550d19129f230d534c832c5a41591682ebbf8.tar.gz | |
lavf: eliminate ff_get_audio_frame_size()
It is basically a wrapper around av_get_audio_frame_duration(), with a
fallback to AVCodecContext.frame_size. However, that field is set only
when the stream codec context is actually used for encoding or decoding,
which is discouraged.
For muxing, it is generally the responsibility of the caller to set the
packet duration.
For demuxing, if the duration is not stored at the container level, it
should be set by the parser.
Therefore, removing the frame_size fallback should not break any
important case.
(cherry picked from commit 30e50c50274f88f0f5ae829f401cd3c7f5266719)
Conflicts:
libavformat/utils.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 08987c76be..30117069a9 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -337,8 +337,6 @@ void ff_free_stream(AVFormatContext *s, AVStream *st); 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); |