generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* 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:
Michael Niedermayer 2014-08-30 14:38:40 +02:00
commit ce36d80881
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg_filter.c
View File

@ -898,8 +898,11 @@ int configure_filtergraph(FilterGraph *fg)
init_input_filter(fg, cur);
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;
}
avfilter_inout_free(&inputs);
if (!init || simple) {

8
libavformat/rtpdec_hevc.c
View File

@ -128,7 +128,7 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s,
hevc_data->using_donl_field = 1;
#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
}
@ -138,7 +138,7 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s,
hevc_data->using_donl_field = 1;
#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
}
@ -295,7 +295,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
/* A/V packet: copy NAL unit data */
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;
/* fragmentation unit (FU) */
@ -367,7 +367,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
}
if(!res){
COUNT_HEVC_NAL_TYPE(data, fu_type);
COUNT_HEVC_NAL_TYPE(rtp_hevc_ctx, fu_type);
}
break;