RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mmst: Use AVUNERROR() to convert error codes to the right range for strerror 

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-06-19 15:21:43 +03:00
parent 561687696f
commit 6aa4e88106
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/mmst.c
View File

@ -144,7 +144,7 @@ static int send_command_packet(MMSTContext *mmst)
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Failed to write data of length %d: %d (%s)\n", "Failed to write data of length %d: %d (%s)\n",
exact_length, write_result, exact_length, write_result,
write_result < 0 ? strerror(write_result) : write_result < 0 ? strerror(AVUNERROR(write_result)) :
"The server closed the connection"); "The server closed the connection");
return AVERROR(EIO); return AVERROR(EIO);
} }
@ -246,7 +246,7 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
if(read_result < 0) { if(read_result < 0) {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Error reading packet header: %d (%s)\n", "Error reading packet header: %d (%s)\n",
read_result, strerror(read_result)); read_result, strerror(AVUNERROR(read_result)));
packet_type = SC_PKT_CANCEL; packet_type = SC_PKT_CANCEL;
} else { } else {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
@ -266,7 +266,7 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Reading command packet length failed: %d (%s)\n", "Reading command packet length failed: %d (%s)\n",
read_result, read_result,
read_result < 0 ? strerror(read_result) : read_result < 0 ? strerror(AVUNERROR(read_result)) :
"The server closed the connection"); "The server closed the connection");
return read_result < 0 ? read_result : AVERROR(EIO); return read_result < 0 ? read_result : AVERROR(EIO);
} }
@ -287,7 +287,7 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Reading pkt data (length=%d) failed: %d (%s)\n", "Reading pkt data (length=%d) failed: %d (%s)\n",
length_remaining, read_result, length_remaining, read_result,
read_result < 0 ? strerror(read_result) : read_result < 0 ? strerror(AVUNERROR(read_result)) :
"The server closed the connection"); "The server closed the connection");
return read_result < 0 ? read_result : AVERROR(EIO); return read_result < 0 ? read_result : AVERROR(EIO);
} }
@ -324,7 +324,7 @@ static MMSSCPacketType get_tcp_server_response(MMSTContext *mmst)
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_ERROR,
"Failed to read packet data of size %d: %d (%s)\n", "Failed to read packet data of size %d: %d (%s)\n",
length_remaining, read_result, length_remaining, read_result,
read_result < 0 ? strerror(read_result) : read_result < 0 ? strerror(AVUNERROR(read_result)) :
"The server closed the connection"); "The server closed the connection");
return read_result < 0 ? read_result : AVERROR(EIO); return read_result < 0 ? read_result : AVERROR(EIO);
} }