OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0dadf9d
)
rtmp: Return proper error codes in handle_chunk_size
author
Samuel Pitoiset
<samuel.pitoiset@gmail.com>
Wed, 25 Jul 2012 18:51:08 +0000
(20:51 +0200)
committer
Martin Storsjö
<martin@martin.st>
Wed, 25 Jul 2012 20:57:00 +0000
(23:57 +0300)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/rtmpproto.c
patch
|
blob
|
history
diff --git
a/libavformat/rtmpproto.c
b/libavformat/rtmpproto.c
index
31d1f69
..
5aa6a54
100644
(file)
--- a/
libavformat/rtmpproto.c
+++ b/
libavformat/rtmpproto.c
@@
-889,7
+889,7
@@
static int handle_chunk_size(URLContext *s, RTMPPacket *pkt)
av_log(s, AV_LOG_ERROR,
"Chunk size change packet is not 4 bytes long (%d)\n",
pkt->data_size);
- return
-1
;
+ return
AVERROR_INVALIDDATA
;
}
if (!rt->is_input) {
@@
-901,7
+901,7
@@
static int handle_chunk_size(URLContext *s, RTMPPacket *pkt)
rt->chunk_size = AV_RB32(pkt->data);
if (rt->chunk_size <= 0) {
av_log(s, AV_LOG_ERROR, "Incorrect chunk size %d\n", rt->chunk_size);
- return
-1
;
+ return
AVERROR_INVALIDDATA
;
}
av_log(s, AV_LOG_DEBUG, "New chunk size = %d\n", rt->chunk_size);