summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-20 03:25:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-21 02:31:27 +0200
commit94eadee7efc2c5d19ecfe92d36f0556663468080 (patch)
treecc6a7f94e04be1f2d92bc7e9af6eeea0a0646b5f /libavcodec/avcodec.h
parent007f773942e5c8f39e9ad880d8e7e71f8f3bf7d2 (diff)
downloadffmpeg-94eadee7efc2c5d19ecfe92d36f0556663468080.tar.gz
Merge/split side data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 99c349ed15..a25612d2f9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3229,6 +3229,11 @@ uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
int *size);
+int av_packet_merge_side_data(AVPacket *pkt);
+
+int av_packet_split_side_data(AVPacket *pkt);
+
+
/* resample.c */
struct ReSampleContext;