History

lavc: add metadata to AVFrame

See thread: Subject: [libav-devel] [PATCH 1/3] avcodec: add metadata to AVFrame Date: Tue, 4 Oct 2011 00:19:51 +0200

Thomas Kühnel committed 15 years ago

Commit f49ec1b1 parent 2090e404 files · +17 −1Browse files

Unified · Split

4 files
  1. doc/APIchanges +4 −0
  2. libavcodec/avcodec.h +11 −0
  3. libavcodec/utils.c +1 −0
  4. libavcodec/version.h +1 −1
doc/APIchanges+4−0
@@ -15,6 +15,10 @@ libavutil: 2011-04-18 · 14 unmodified lines
15 15
16API changes, most recent first:16API changes, most recent first:
17 17
182012-07-14 - xxxxxxx - lavc 54.38.100 - avcodec.h
19 Add metadata to AVFrame, and the accessor functions
20 av_frame_get_metadata() and av_frame_set_metadata().
21
182012-07-10 - xxxxxxx - lavc 54.33.100222012-07-10 - xxxxxxx - lavc 54.33.100
19 Add av_fast_padded_mallocz().23 Add av_fast_padded_mallocz().
20 24
libavcodec/avcodec.h+11−0
@@ -1313,6 +1313,15 @@ typedef struct AVFrame { · 1312 unmodified lines
1313 * - decoding: Read by user.1313 * - decoding: Read by user.
1314 */1314 */
1315 int64_t pkt_duration;1315 int64_t pkt_duration;
1316
1317 /**
1318 * metadata.
1319 * Code outside libavcodec should access this field using:
1320 * av_frame_get_metadata(frame)
1321 * - encoding: Set by user.
1322 * - decoding: Set by libavcodec.
1323 */
1324 AVDictionary *metadata;
1316} AVFrame;1325} AVFrame;
1317 1326
1318/**1327/**
@@ -1325,11 +1334,13 @@ int64_t av_frame_get_pkt_duration (const AVFrame *frame); · 6 unmodified lines
1325int64_t av_frame_get_pkt_pos (const AVFrame *frame);1334int64_t av_frame_get_pkt_pos (const AVFrame *frame);
1326int64_t av_frame_get_channel_layout (const AVFrame *frame);1335int64_t av_frame_get_channel_layout (const AVFrame *frame);
1327int av_frame_get_sample_rate (const AVFrame *frame);1336int av_frame_get_sample_rate (const AVFrame *frame);
1337AVDictionary *av_frame_get_metadata (const AVFrame *frame);
1328void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);1338void av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
1329void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);1339void av_frame_set_pkt_duration (AVFrame *frame, int64_t val);
1330void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);1340void av_frame_set_pkt_pos (AVFrame *frame, int64_t val);
1331void av_frame_set_channel_layout (AVFrame *frame, int64_t val);1341void av_frame_set_channel_layout (AVFrame *frame, int64_t val);
1332void av_frame_set_sample_rate (AVFrame *frame, int val);1342void av_frame_set_sample_rate (AVFrame *frame, int val);
1343void av_frame_set_metadata (AVFrame *frame, AVDictionary *val);
1333 1344
1334struct AVCodecInternal;1345struct AVCodecInternal;
1335 1346
libavcodec/utils.c+1−0
@@ -725,6 +725,7 @@ MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_duration) · 724 unmodified lines
725MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos)725MAKE_ACCESSORS(AVFrame, frame, int64_t, pkt_pos)
726MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout)726MAKE_ACCESSORS(AVFrame, frame, int64_t, channel_layout)
727MAKE_ACCESSORS(AVFrame, frame, int, sample_rate)727MAKE_ACCESSORS(AVFrame, frame, int, sample_rate)
728MAKE_ACCESSORS(AVFrame, frame, AVDictionary *, metadata)
728 729
729MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase)730MAKE_ACCESSORS(AVCodecContext, codec, AVRational, pkt_timebase)
730 731
libavcodec/version.h+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27 */27 */
28 28
29#define LIBAVCODEC_VERSION_MAJOR 5429#define LIBAVCODEC_VERSION_MAJOR 54
30#define LIBAVCODEC_VERSION_MINOR 3730#define LIBAVCODEC_VERSION_MINOR 38
31#define LIBAVCODEC_VERSION_MICRO 10031#define LIBAVCODEC_VERSION_MICRO 100
32 32
33#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \33#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t