diff mbox

[FFmpeg-devel,09/12] rtmpproto: Fix error return

Message ID 20170706182842.7785-10-derek.buitenhuis@gmail.com
State Accepted
Commit c27d7c027cd7defd44bf11ba9c0526279a3773c3
Headers show

Commit Message

Derek Buitenhuis July 6, 2017, 6:28 p.m. UTC 
Mistake was added in 5840473890440dbe0bd2cce530ebb3d93e187ae6.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 libavformat/rtmpproto.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steven Liu July 6, 2017, 10:41 p.m. UTC | #1 
2017-07-07 2:28 GMT+08:00 Derek Buitenhuis <derek.buitenhuis@gmail.com>:
> Mistake was added in 5840473890440dbe0bd2cce530ebb3d93e187ae6.
>
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
>  libavformat/rtmpproto.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
> index ae55a33284..7dd9cdddaf 100644
> --- a/libavformat/rtmpproto.c
> +++ b/libavformat/rtmpproto.c
> @@ -2507,7 +2507,7 @@ static int get_packet(URLContext *s, int for_header)
>          } else if (rpkt.type == RTMP_PT_METADATA) {
>              ret = handle_metadata(rt, &rpkt);
>              ff_rtmp_packet_destroy(&rpkt);
> -            return 0;
> +            return ret;
>          }
>          ff_rtmp_packet_destroy(&rpkt);
>      }
> --
> 2.11.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

ok
diff mbox

Patch

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index ae55a33284..7dd9cdddaf 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2507,7 +2507,7 @@  static int get_packet(URLContext *s, int for_header)
         } else if (rpkt.type == RTMP_PT_METADATA) {
             ret = handle_metadata(rt, &rpkt);
             ff_rtmp_packet_destroy(&rpkt);
-            return 0;
+            return ret;
         }
         ff_rtmp_packet_destroy(&rpkt);
     }