diff options
| author | James Almer <jamrial@gmail.com> | 2020-10-28 11:59:16 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-10-28 11:59:16 -0300 |
| commit | 7f76974e7d42c492ff6978b9d72ff618e8e2ccab (patch) | |
| tree | d0ca09a686036ae416fa2ad56fdd5c037908c867 | |
| parent | 3916af4d95835d74d347ca640c7b7ee17b38f529 (diff) | |
| download | ffmpeg-7f76974e7d42c492ff6978b9d72ff618e8e2ccab.tar.gz | |
libavcodec/codec2utils: remove codec2_version_from_extradata()
It's only used in the codec2 demuxers, and can be simplified with an AV_RB16()
call instead.
Suggested-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/codec2utils.h | 5 | ||||
| -rw-r--r-- | libavformat/codec2.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/codec2utils.h b/libavcodec/codec2utils.h index e9b1f84d84..2ee7a592a1 100644 --- a/libavcodec/codec2utils.h +++ b/libavcodec/codec2utils.h @@ -70,11 +70,6 @@ static inline void codec2_make_extradata(uint8_t *ptr, int mode) { ptr[3] = 0; //flags } -//Returns version as a 16-bit value. 0.8 -> 0x0008 -static inline uint16_t codec2_version_from_extradata(uint8_t *ptr) { - return (ptr[0] << 8) + ptr[1]; -} - static inline uint8_t codec2_mode_from_extradata(uint8_t *ptr) { return ptr[2]; } diff --git a/libavformat/codec2.c b/libavformat/codec2.c index 1f7f16a106..bf2fb4aa43 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -110,7 +110,7 @@ static int codec2_read_header(AVFormatContext *s) return ret; } - version = codec2_version_from_extradata(st->codecpar->extradata); + version = AV_RB16(st->codecpar->extradata); if ((version >> 8) != EXPECTED_CODEC2_MAJOR_VERSION) { avpriv_report_missing_feature(s, "Major version %i", version >> 8); return AVERROR_PATCHWELCOME; |