[FFmpeg-cvslog] Merge commit 'adb0e941c329a4778ade6dd0a326274472992f54'

Clément Bœsch git at videolan.org
Sat Apr 1 19:25:35 EEST 2017


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 18:22:21 2017 +0200| [507a85b93c9388aeb290664183e572ee42288c2d] | committer: Clément Bœsch

Merge commit 'adb0e941c329a4778ade6dd0a326274472992f54'

* commit 'adb0e941c329a4778ade6dd0a326274472992f54':
  avpacket: Mark src pointer as constant

See 5bb3f8825584a319b25b430e4ece2fa5b2b47ff9

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=507a85b93c9388aeb290664183e572ee42288c2d
---

 libavcodec/avcodec.h  | 2 +-
 libavcodec/avpacket.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 60f7ace..d780477 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4452,7 +4452,7 @@ AVPacket *av_packet_alloc(void);
  * @see av_packet_alloc
  * @see av_packet_ref
  */
-AVPacket *av_packet_clone(AVPacket *src);
+AVPacket *av_packet_clone(const AVPacket *src);
 
 /**
  * Free the packet, if the packet is reference counted, it will be
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 8420d8b..e633245 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -614,7 +614,7 @@ fail:
     return ret;
 }
 
-AVPacket *av_packet_clone(AVPacket *src)
+AVPacket *av_packet_clone(const AVPacket *src)
 {
     AVPacket *ret = av_packet_alloc();
 


======================================================================




More information about the ffmpeg-cvslog mailing list