diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 14:38:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 14:38:44 +0200 |
| commit | ce36d80881132d3ddb7d2d859a604106cf7e92d4 (patch) | |
| tree | 586846f568c11c4a6426f48f1c167191d889626a /libavformat | |
| parent | a808733675ccfaf19e923477b18c1ad15be4dd67 (diff) | |
| parent | f22c24bd7a57eca27ccc400dbb334b20db5fb050 (diff) | |
| download | ffmpeg-ce36d80881132d3ddb7d2d859a604106cf7e92d4.tar.gz | |
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 2cc76dcb0d..4504e1202c 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -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; |