summaryrefslogtreecommitdiff
path: root/pjmedia/src/pjmedia-codec
diff options
context:
space:
mode:
Diffstat (limited to 'pjmedia/src/pjmedia-codec')
-rw-r--r--pjmedia/src/pjmedia-codec/ffmpeg_codecs.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
index 94610068..e0886b02 100644
--- a/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
+++ b/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c
@@ -341,9 +341,11 @@ static pj_status_t h264_preopen(ffmpeg_private *ff)
return status;
/* Apply SDP fmtp to format in codec param */
- status = pjmedia_vid_codec_h264_apply_fmtp(&ff->param);
- if (status != PJ_SUCCESS)
- return status;
+ if (!ff->param.ignore_fmtp) {
+ status = pjmedia_vid_codec_h264_apply_fmtp(&ff->param);
+ if (status != PJ_SUCCESS)
+ return status;
+ }
if (ff->param.dir & PJMEDIA_DIR_ENCODING) {
AVCodecContext *ctx = ff->enc_ctx;
@@ -448,7 +450,9 @@ static pj_status_t h263_preopen(ffmpeg_private *ff)
return status;
/* Apply fmtp settings to codec param */
- status = pjmedia_vid_codec_h263_apply_fmtp(&ff->param);
+ if (!ff->param.ignore_fmtp) {
+ status = pjmedia_vid_codec_h263_apply_fmtp(&ff->param);
+ }
return status;
}