RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/rtpdec_hevc: Don't reimplement ff_alloc_extradata 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2019-12-10 22:59:52 +01:00 committed by Michael Niedermayer
parent c1d300f83a
commit cb88cdf773
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/rtpdec_hevc.c
View File

@ -25,6 +25,7 @@
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h"
#include "rtpdec.h" #include "rtpdec.h"
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
@ -147,15 +148,9 @@ static av_cold int hevc_parse_sdp_line(AVFormatContext *ctx, int st_index,
hevc_sdp_parse_fmtp_config); hevc_sdp_parse_fmtp_config);
if (hevc_data->vps_size || hevc_data->sps_size || if (hevc_data->vps_size || hevc_data->sps_size ||
hevc_data->pps_size || hevc_data->sei_size) { hevc_data->pps_size || hevc_data->sei_size) {
av_freep(&par->extradata);
par->extradata_size = hevc_data->vps_size + hevc_data->sps_size + par->extradata_size = hevc_data->vps_size + hevc_data->sps_size +
hevc_data->pps_size + hevc_data->sei_size; hevc_data->pps_size + hevc_data->sei_size;
par->extradata = av_malloc(par->extradata_size + if ((ret = ff_alloc_extradata(par, par->extradata_size)) >= 0) {
AV_INPUT_BUFFER_PADDING_SIZE);
if (!par->extradata) {
ret = AVERROR(ENOMEM);
par->extradata_size = 0;
} else {
int pos = 0; int pos = 0;
memcpy(par->extradata + pos, hevc_data->vps, hevc_data->vps_size); memcpy(par->extradata + pos, hevc_data->vps, hevc_data->vps_size);
pos += hevc_data->vps_size; pos += hevc_data->vps_size;
@ -164,8 +159,6 @@ static av_cold int hevc_parse_sdp_line(AVFormatContext *ctx, int st_index,
memcpy(par->extradata + pos, hevc_data->pps, hevc_data->pps_size); memcpy(par->extradata + pos, hevc_data->pps, hevc_data->pps_size);
pos += hevc_data->pps_size; pos += hevc_data->pps_size;
memcpy(par->extradata + pos, hevc_data->sei, hevc_data->sei_size); memcpy(par->extradata + pos, hevc_data->sei, hevc_data->sei_size);
pos += hevc_data->sei_size;
memset(par->extradata + pos, 0, AV_INPUT_BUFFER_PADDING_SIZE);
} }
av_freep(&hevc_data->vps); av_freep(&hevc_data->vps);