diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:23:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:23:26 +0100 |
| commit | 17773f49b7da49ceecc4b6260d5ded6938f9b163 (patch) | |
| tree | 931f84efb95880bc513ef45449739178e0587406 /libavformat/rtpdec_formats.h | |
| parent | 0f8de2b5f17b051d2cfdf1ba25c2990368df1a27 (diff) | |
| parent | 3567b91e49c6ae101c9a35c90f46b8ad9890ac15 (diff) | |
| download | ffmpeg-17773f49b7da49ceecc4b6260d5ded6938f9b163.tar.gz | |
Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'
* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
rtpdec_hevc: Share the implementation of fragmented packets with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_formats.h')
| -rw-r--r-- | libavformat/rtpdec_formats.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h index 57764ae451..50a2f4ca3e 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -42,6 +42,9 @@ int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data, const uint8_t *buf, int len, int start_skip, int *nal_counters, int nal_mask); +int ff_h264_handle_frag_packet(AVPacket *pkt, const uint8_t *buf, int len, + int start_bit, const uint8_t *nal_header, + int nal_header_len); void ff_h264_parse_framesize(AVCodecContext *codec, const char *p); extern RTPDynamicProtocolHandler ff_ac3_dynamic_handler; |