diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 02:54:59 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 03:03:07 +0400 |
| commit | a7758884db7eb3041b73d673c1ac3897609556b9 (patch) | |
| tree | fbf882650e3d0607bd189ae571e402b55179f078 /libavformat/rtp.c | |
| parent | f7e797aa5c987c39b55666a2d41877ef2aec40bc (diff) | |
| parent | 0c378ea1f76e226eff460c84634e7227e3705372 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtp: factorize dynamic payload type fallback
flvdec: Ignore the index if it's from a creator known to be different
cmdutils: move grow_array out of #if CONFIG_AVFILTER
avconv: actually set InputFile.rate_emu
ratecontrol: update last_qscale_for sooner
Fix unnecessary shift with 9/10bit vertical scaling
prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
prores: return more meaningful error values
prores: improve error message wording
prores: cosmetics: prettyprinting, drop useless parentheses
prores: lowercase AVCodec name entry
Conflicts:
cmdutils.c
libavcodec/proresdec_lgpl.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtp.c')
| -rw-r--r-- | libavformat/rtp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c index 70c5e99704..ab815233ab 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -103,6 +103,11 @@ int ff_rtp_get_payload_type(AVCodecContext *codec) continue; payload_type = AVRtpPayloadTypes[i].pt; } + + /* dynamic payload type */ + if (payload_type < 0) + payload_type = RTP_PT_PRIVATE + (codec->codec_type == AVMEDIA_TYPE_AUDIO); + return payload_type; } |