mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-16 11:54:09 +02:00
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: lavf/rtpdec_hevc: Fix compilation with -DDEBUG. ffmpeg: Clean up if filter initialisation failed to avoid a memleak. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ce36d80881
@ -898,8 +898,11 @@ int configure_filtergraph(FilterGraph *fg)
|
|||||||
init_input_filter(fg, cur);
|
init_input_filter(fg, cur);
|
||||||
|
|
||||||
for (cur = inputs, i = 0; cur; cur = cur->next, i++)
|
for (cur = inputs, i = 0; cur; cur = cur->next, i++)
|
||||||
if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0)
|
if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0) {
|
||||||
|
avfilter_inout_free(&inputs);
|
||||||
|
avfilter_inout_free(&outputs);
|
||||||
return ret;
|
return ret;
|
||||||
|
}
|
||||||
avfilter_inout_free(&inputs);
|
avfilter_inout_free(&inputs);
|
||||||
|
|
||||||
if (!init || simple) {
|
if (!init || simple) {
|
||||||
|
@ -128,7 +128,7 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s,
|
|||||||
hevc_data->using_donl_field = 1;
|
hevc_data->using_donl_field = 1;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
av_log(s, AV_LOG_DEBUG, "SDP: found sprop-max-don-diff in SDP, DON field usage is: %d\n", hevc_data->using_dons);
|
av_log(s, AV_LOG_DEBUG, "SDP: found sprop-max-don-diff in SDP, DON field usage is: %d\n", hevc_data->using_donl_field);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,7 +138,7 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s,
|
|||||||
hevc_data->using_donl_field = 1;
|
hevc_data->using_donl_field = 1;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
av_log(s, AV_LOG_DEBUG, "SDP: found sprop-depack-buf-nalus in SDP, DON field usage is: %d\n", hevc_data->using_dons);
|
av_log(s, AV_LOG_DEBUG, "SDP: found sprop-depack-buf-nalus in SDP, DON field usage is: %d\n", hevc_data->using_donl_field);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -295,7 +295,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
|
|||||||
/* A/V packet: copy NAL unit data */
|
/* A/V packet: copy NAL unit data */
|
||||||
memcpy(pkt->data + sizeof(start_sequence), buf, len);
|
memcpy(pkt->data + sizeof(start_sequence), buf, len);
|
||||||
|
|
||||||
COUNT_HEVC_NAL_TYPE(data, nal_type);
|
COUNT_HEVC_NAL_TYPE(rtp_hevc_ctx, nal_type);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
/* fragmentation unit (FU) */
|
/* fragmentation unit (FU) */
|
||||||
@ -367,7 +367,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!res){
|
if(!res){
|
||||||
COUNT_HEVC_NAL_TYPE(data, fu_type);
|
COUNT_HEVC_NAL_TYPE(rtp_hevc_ctx, fu_type);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user