diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:01:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:01:44 +0100 |
| commit | 596f81c75b67eb78fee75de32cd5dd0f4eb85430 (patch) | |
| tree | ac325bd88f90339d335fe9983d9df80191e94314 /libavformat/rtpdec_hevc.c | |
| parent | 34a8de866f88186f54da87a8e322c48910659149 (diff) | |
| parent | fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc (diff) | |
Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units
Conflicts:
libavformat/rtpdec_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_hevc.c')
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 3b3b260ac4..2622cb4b2c 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -321,9 +321,15 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx buf += RTP_HEVC_PAYLOAD_HEADER_SIZE; len -= RTP_HEVC_PAYLOAD_HEADER_SIZE; + /* pass the HEVC DONL field */ + if (rtp_hevc_ctx->using_donl_field) { + buf += RTP_HEVC_DONL_FIELD_SIZE; + len -= RTP_HEVC_DONL_FIELD_SIZE; + } + res = ff_h264_handle_aggregated_packet(ctx, rtp_hevc_ctx, pkt, buf, len, rtp_hevc_ctx->using_donl_field ? - RTP_HEVC_DONL_FIELD_SIZE : 0, + RTP_HEVC_DOND_FIELD_SIZE : 0, NULL, 0); if (res < 0) return res; |