ffmpeg | branch: master | Carl Eugen Hoyos <[email protected]> | Sat Aug 26 11:59:34 2017 +0200| [1c56becb9b04219a36692479c32319765980521b] | committer: Carl Eugen Hoyos
lavc/utils: Calculate frame duration for little-endian G.726. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c56becb9b04219a36692479c32319765980521b --- libavcodec/utils.c | 2 +- libavcodec/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 1b8ad1d200..baf4992b19 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 48e57bd86b..1db347a9f3 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, \ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
