diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-28 00:15:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-28 00:50:23 +0200 |
| commit | 394b692b70587af74a6957640cab0dce3bc9934d (patch) | |
| tree | 4ed3f05e87700f045c91d4c9c33e31d5aae23442 | |
| parent | 875851294f7dc3ce5945c6d43b76c5dd1e0ec03d (diff) | |
| parent | 8271f55bd7d6f4e06786dc8dd7c9538d83ad026a (diff) | |
| download | ffmpeg-394b692b70587af74a6957640cab0dce3bc9934d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avprobe: restore pseudo-INI old style format for compatibility.
avprobe: fix formatting.
log: make colored output more colorful.
rtsp: Check for dynamic payload handlers if no static payload mapping was found
Conflicts:
Changelog
doc/ffprobe.texi
ffprobe.c
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtsp.c | 14 | ||||
| -rw-r--r-- | libavutil/log.c | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index e3b6e1df5f..891afc92a4 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -198,7 +198,14 @@ static int sdp_parse_rtpmap(AVFormatContext *s, * particular servers ("RealServer Version 6.1.3.970", see issue 1658) * have a trailing space. */ get_word_sep(buf, sizeof(buf), "/ ", &p); - if (payload_type >= RTP_PT_PRIVATE) { + if (payload_type < RTP_PT_PRIVATE) { + /* We are in a standard case + * (from http://www.iana.org/assignments/rtp-parameters). */ + /* search into AVRtpPayloadTypes[] */ + codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type); + } + + if (codec->codec_id == CODEC_ID_NONE) { RTPDynamicProtocolHandler *handler = ff_rtp_handler_find_by_name(buf, codec->codec_type); init_rtp_handler(handler, rtsp_st, codec); @@ -208,11 +215,6 @@ static int sdp_parse_rtpmap(AVFormatContext *s, * the format name from the rtpmap line never is passed into rtpdec. */ if (!rtsp_st->dynamic_handler) codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type); - } else { - /* We are in a standard case - * (from http://www.iana.org/assignments/rtp-parameters). */ - /* search into AVRtpPayloadTypes[] */ - codec->codec_id = ff_rtp_codec_id(buf, codec->codec_type); } c = avcodec_find_decoder(codec->codec_id); diff --git a/libavutil/log.c b/libavutil/log.c index fbe9ea0a68..e62f11ceb4 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -34,13 +34,13 @@ static int flags; #if defined(_WIN32) && !defined(__MINGW32CE__) #include <windows.h> -static const uint8_t color[] = { 12, 12, 12, 14, 7, 7, 10 }; +static const uint8_t color[] = { 12, 12, 12, 14, 7, 10, 11 }; static int16_t background, attr_orig; static HANDLE con; #define set_color(x) SetConsoleTextAttribute(con, background | color[x]) #define reset_color() SetConsoleTextAttribute(con, attr_orig) #else -static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 9, 2 }; +static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 0x02, 0x06 }; #define set_color(x) fprintf(stderr, "\033[%d;3%dm", color[x] >> 4, color[x]&15) #define reset_color() fprintf(stderr, "\033[0m") #endif |