diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-08-26 11:59:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-08-26 11:59:34 +0200 |
| commit | 1c56becb9b04219a36692479c32319765980521b (patch) | |
| tree | c73b5d7628102d56b29b29680f580bbd507b55bf /libavcodec | |
| parent | 9d494c5e553fe3430df2fde0c456a723ae15f4ab (diff) | |
| download | ffmpeg-streaming-1c56becb9b04219a36692479c32319765980521b.zip ffmpeg-streaming-1c56becb9b04219a36692479c32319765980521b.tar.gz | |
lavc/utils: Calculate frame duration for little-endian G.726.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1b8ad1d..baf4992 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1757,7 +1757,7 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, if (bps > 0) { /* calc from frame_bytes and bits_per_coded_sample */ - if (id == AV_CODEC_ID_ADPCM_G726) + if (id == AV_CODEC_ID_ADPCM_G726 || id == AV_CODEC_ID_ADPCM_G726LE) return frame_bytes * 8 / bps; } diff --git a/libavcodec/version.h b/libavcodec/version.h index 48e57bd..1db347a 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 103 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |
