eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'

Browse Source 
* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
  rtpdec: Move setting the parsing flags to the actual depacketizers
  rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer

Conflicts:
	libavformat/rtpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-01-21 14:00:03 +01:00
parent 950482bf58 c6f1dc8e4c
commit 0a5da9cc14
9 changed files with 130 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/rtpdec_mpeg4.c
View File

@@ -252,10 +252,19 @@ static int parse_sdp_line(AVFormatContext *s, int st_index,
return 0;
}
static int init_video(AVFormatContext *s, int st_index, PayloadContext *data)
{
if (st_index < 0)
return 0;
s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
return 0;
}
RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
.enc_name = "MP4V-ES",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_MPEG4,
.init = init_video,
.parse_sdp_a_line = parse_sdp_line,
};