diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 20:28:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 22:12:03 +0400 |
commit | 2653e125204569b1e9439ee2671c6ebb23a94b80 (patch) | |
tree | 4176f76bccc8cdd1c85b9d329a82867eda37d397 /libavformat/id3v2.h | |
parent | 532f31a695c9530ce67a847be00d72e6e8acfd11 (diff) | |
parent | 1afddbe59e96af75f1c07605afc95615569f388f (diff) |
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
avpacket: use AVBuffer to allow refcounting the packets.
Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/id3v2.h')
-rw-r--r-- | libavformat/id3v2.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index f7270106a1..e893922133 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -67,8 +67,7 @@ typedef struct ID3v2ExtraMetaGEOB { } ID3v2ExtraMetaGEOB; typedef struct ID3v2ExtraMetaAPIC { - uint8_t *data; - int len; + AVBufferRef *buf; const char *type; uint8_t *description; enum AVCodecID id; |