apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-26 01:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2015-02-24 23:03:12 +01:00
parent df38883607 8633fb47db
commit 29f9d82d23
3 changed files with 25 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/rtpdec_formats.h
+1
View File
@@ -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;