Browse Source

avcodec.h, avpacket.c: use const AVPacket pointers in copy functions

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Roman Fietze Michael Niedermayer 12 years ago
parent
commit
5bb3f88255
2 changed files with 7 additions and 7 deletions
  1. +3
    -3
      libavcodec/avcodec.h
  2. +4
    -4
      libavcodec/avpacket.c

+ 3
- 3
libavcodec/avcodec.h View File

@@ -3602,14 +3602,14 @@ int av_dup_packet(AVPacket *pkt);
*
* @return 0 on success, negative AVERROR on fail
*/
int av_copy_packet(AVPacket *dst, AVPacket *src);
int av_copy_packet(AVPacket *dst, const AVPacket *src);

/**
* Copy packet side data
*
* @return 0 on success, negative AVERROR on fail
*/
int av_copy_packet_side_data(AVPacket *dst, AVPacket *src);
int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src);

/**
* Free a packet.
@@ -3698,7 +3698,7 @@ void av_packet_free_side_data(AVPacket *pkt);
*
* @return 0 on success, a negative AVERROR on error.
*/
int av_packet_ref(AVPacket *dst, AVPacket *src);
int av_packet_ref(AVPacket *dst, const AVPacket *src);

/**
* Wipe the packet.


+ 4
- 4
libavcodec/avpacket.c View File

@@ -190,7 +190,7 @@ do { \
} while (0)

/* Makes duplicates of data, side_data, but does not copy any other fields */
static int copy_packet_data(AVPacket *pkt, AVPacket *src, int dup)
static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup)
{
pkt->data = NULL;
pkt->side_data = NULL;
@@ -220,7 +220,7 @@ failed_alloc:
return AVERROR(ENOMEM);
}

int av_copy_packet_side_data(AVPacket *pkt, AVPacket *src)
int av_copy_packet_side_data(AVPacket *pkt, const AVPacket *src)
{
if (src->side_data_elems) {
int i;
@@ -262,7 +262,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
return 0;
}

int av_copy_packet(AVPacket *dst, AVPacket *src)
int av_copy_packet(AVPacket *dst, const AVPacket *src)
{
*dst = *src;
return copy_packet_data(dst, src, 0);
@@ -534,7 +534,7 @@ void av_packet_unref(AVPacket *pkt)
pkt->size = 0;
}

int av_packet_ref(AVPacket *dst, AVPacket *src)
int av_packet_ref(AVPacket *dst, const AVPacket *src)
{
int ret;



Loading…
Cancel
Save