diff mbox

[FFmpeg-devel,v1,2/2] avformat/rtsp.h: Add https tunneling support for RTSP

Message ID 20190321222444.16575-2-junli1026@gmail.com
State New
Headers show

Commit Message

Jun Li March 21, 2019, 10:24 p.m. UTC 
Add new enum for RTSP/RTP HTTPS tunneling. Tested on Axis and
Bosch cameras.
---
 libavformat/rtsp.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Carl Eugen Hoyos March 21, 2019, 10:59 p.m. UTC | #1 
2019-03-21 23:24 GMT+01:00, Jun Li <junli1026@gmail.com>:
> Add new enum for RTSP/RTP HTTPS tunneling. Tested on Axis and
> Bosch cameras.
> ---
>  libavformat/rtsp.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
> index 9a7f366b39..b49278fc20 100644
> --- a/libavformat/rtsp.h
> +++ b/libavformat/rtsp.h
> @@ -42,6 +42,7 @@ enum RTSPLowerTransport {
>      RTSP_LOWER_TRANSPORT_HTTP = 8,          /**< HTTP tunneled - not a
> proper
>                                                   transport mode as such,
>                                                   only for use via AVOptions
> */
> +    RTSP_LOWER_TRANSPORT_HTTPS,             /**< HTTPS tunneled */

You cannot use the define that you add in patch 2/2 already
in an earlier patch.

Please merge the patches, thank you, Carl Eugen
Jun Li March 21, 2019, 11:43 p.m. UTC | #2 
On Thu, Mar 21, 2019 at 3:59 PM Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:

> 2019-03-21 23:24 GMT+01:00, Jun Li <junli1026@gmail.com>:
> > Add new enum for RTSP/RTP HTTPS tunneling. Tested on Axis and
> > Bosch cameras.
> > ---
> >  libavformat/rtsp.h | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
> > index 9a7f366b39..b49278fc20 100644
> > --- a/libavformat/rtsp.h
> > +++ b/libavformat/rtsp.h
> > @@ -42,6 +42,7 @@ enum RTSPLowerTransport {
> >      RTSP_LOWER_TRANSPORT_HTTP = 8,          /**< HTTP tunneled - not a
> > proper
> >                                                   transport mode as such,
> >                                                   only for use via
> AVOptions
> > */
> > +    RTSP_LOWER_TRANSPORT_HTTPS,             /**< HTTPS tunneled */
>
> You cannot use the define that you add in patch 2/2 already
> in an earlier patch.
>
> Please merge the patches, thank you, Carl Eugen
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".




Thanks Carl. I thought every patch should only contain single file change.
So here do I need to switch the 2 commits order, or merge two file changes
into one patch ?
Thanks.

Best Regards,
-Jun
diff mbox

Patch

diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index 9a7f366b39..b49278fc20 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -42,6 +42,7 @@  enum RTSPLowerTransport {
     RTSP_LOWER_TRANSPORT_HTTP = 8,          /**< HTTP tunneled - not a proper
                                                  transport mode as such,
                                                  only for use via AVOptions */
+    RTSP_LOWER_TRANSPORT_HTTPS,             /**< HTTPS tunneled */
     RTSP_LOWER_TRANSPORT_CUSTOM = 16,       /**< Custom IO - not a public
                                                  option for lower_transport_mask,
                                                  but set in the SDP demuxer based