diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:03:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:03:12 +0100 |
| commit | 29f9d82d23ffc4e48c220c68c7041ca581632981 (patch) | |
| tree | 4ea28e802df1b855a415754ad05cd6b5ef0c4b04 /libavformat/rtpdec_formats.h | |
| parent | df38883607d256135082d76f22f4f93051dda690 (diff) | |
| parent | 8633fb47db2ec39eb8bd1bd65302af75a94ff5d0 (diff) | |
Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'
* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
rtpdec_hevc: Share the implementation of parsing a=framesize 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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h index 0d216adb0c..57764ae451 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -42,6 +42,7 @@ 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); +void ff_h264_parse_framesize(AVCodecContext *codec, const char *p); extern RTPDynamicProtocolHandler ff_ac3_dynamic_handler; extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler; |