virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Preserve status reason

Browse Source 
It is used to provide meaningful error messages.

Originally committed as revision 24714 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Barbato
2010-08-06 10:26:30 +00:00
parent 06a2ba230b
commit d93fdcbf5c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtsp.c
View File

@@ -824,6 +824,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
get_word(buf1, sizeof(buf1), &p); get_word(buf1, sizeof(buf1), &p);
get_word(buf1, sizeof(buf1), &p); get_word(buf1, sizeof(buf1), &p);
reply->status_code = atoi(buf1); reply->status_code = atoi(buf1);
av_strlcpy(reply->reason, p, sizeof(reply->reason));
} else { } else {
ff_rtsp_parse_line(reply, p, &rt->auth_state); ff_rtsp_parse_line(reply, p, &rt->auth_state);
av_strlcat(rt->last_reply, p, sizeof(rt->last_reply)); av_strlcat(rt->last_reply, p, sizeof(rt->last_reply));
@@ -961,9 +962,10 @@ retry:
goto retry; goto retry;
if (reply->status_code > 400){ if (reply->status_code > 400){
av_log(s, AV_LOG_ERROR, "method %s failed, %d\n", av_log(s, AV_LOG_ERROR, "method %s failed: %d%s\n",
method, method,
reply->status_code); reply->status_code,
reply->reason);
av_log(s, AV_LOG_DEBUG, "%s\n", rt->last_reply); av_log(s, AV_LOG_DEBUG, "%s\n", rt->last_reply);
} }

5
libavformat/rtsp.h
View File

@@ -159,6 +159,11 @@ typedef struct RTSPMessageHeader {
* http://tools.ietf.org/html/draft-stiemerling-rtsp-announce-00 * http://tools.ietf.org/html/draft-stiemerling-rtsp-announce-00
* for a complete list of supported values. */ * for a complete list of supported values. */
int notice; int notice;
/** The "reason" is meant to specify better the meaning of the error code
* returned
*/
char reason[256];
} RTSPMessageHeader; } RTSPMessageHeader;
/** /**