diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-31 21:19:49 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-03-31 21:20:02 +0100 |
commit | e6053b3b19c070e994a501fe0cc20255d15c4aa8 (patch) | |
tree | 493b0d19d642476b404abf043d4ae696b853ef05 /libavcodec/avcodec.h | |
parent | f9b1cf15c233dde29f3659c903e32f74be4fdb95 (diff) | |
parent | a8068346e48e123f8d3bdf4d64464d81e53e5fc7 (diff) | |
download | ffmpeg-e6053b3b19c070e994a501fe0cc20255d15c4aa8.tar.gz |
Merge commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7'
* commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7':
lavc: add a variant of av_get_audio_frame_duration working with AVCodecParameters
Fixes from jamrial incorporated.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 94993d3371..0d37083ee2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5342,6 +5342,12 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id); */ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes); +/** + * This function is the same as av_get_audio_frame_duration(), except it works + * with AVCodecParameters instead of an AVCodecContext. + */ +int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes); + typedef struct AVBitStreamFilterContext { void *priv_data; |