RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 09:11:17 +00:00
Code Issues Projects Releases Wiki Activity

libavcodec/codec2utils: remove codec2_version_from_extradata()

Browse Source 
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>
This commit is contained in:
James Almer 2020-10-28 11:59:16 -03:00
parent 3916af4d95
commit 7f76974e7d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/codec2utils.h
View File

@ -70,11 +70,6 @@ static inline void codec2_make_extradata(uint8_t *ptr, int mode) {
ptr[3] = 0; //flags 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) { static inline uint8_t codec2_mode_from_extradata(uint8_t *ptr) {
return ptr[2]; return ptr[2];
} }

2
libavformat/codec2.c
View File

@ -110,7 +110,7 @@ static int codec2_read_header(AVFormatContext *s)
return ret; return ret;
} }
version = codec2_version_from_extradata(st->codecpar->extradata); version = AV_RB16(st->codecpar->extradata);
if ((version >> 8) != EXPECTED_CODEC2_MAJOR_VERSION) { if ((version >> 8) != EXPECTED_CODEC2_MAJOR_VERSION) {
avpriv_report_missing_feature(s, "Major version %i", version >> 8); avpriv_report_missing_feature(s, "Major version %i", version >> 8);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;