summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h38
1 files changed, 16 insertions, 22 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e476538ecb..690ea385ee 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1285,51 +1285,45 @@ typedef struct AVFrame {
uint8_t **extended_data;
/**
- * frame timestamp estimated using various heuristics, in stream time base
- * Code outside libavcodec should access this field using:
- * av_opt_ptr(avcodec_get_frame_class(), frame, "best_effort_timestamp");
+ * sample aspect ratio for the video frame, 0/1 if unknown\unspecified
* - encoding: unused
- * - decoding: set by libavcodec, read by user.
+ * - decoding: Read by user.
*/
- int64_t best_effort_timestamp;
+ AVRational sample_aspect_ratio;
/**
- * reordered pos from the last AVPacket that has been input into the decoder
- * Code outside libavcodec should access this field using:
- * av_opt_ptr(avcodec_get_frame_class(), frame, "pkt_pos");
+ * width and height of the video frame
* - encoding: unused
* - decoding: Read by user.
*/
- int64_t pkt_pos;
+ int width, height;
/**
- * reordered sample aspect ratio for the video frame, 0/1 if unknown\unspecified
- * Code outside libavcodec should access this field using:
- * av_opt_ptr(avcodec_get_frame_class(), frame, "sample_aspect_ratio");
+ * format of the frame, -1 if unknown or unset
+ * Values correspond to enum PixelFormat for video frames,
+ * enum AVSampleFormat for audio)
* - encoding: unused
* - decoding: Read by user.
*/
- AVRational sample_aspect_ratio;
+ int format;
/**
- * width and height of the video frame
+ * frame timestamp estimated using various heuristics, in stream time base
* Code outside libavcodec should access this field using:
- * av_opt_ptr(avcodec_get_frame_class(), frame, "width");
+ * av_opt_ptr(avcodec_get_frame_class(), frame, "best_effort_timestamp");
* - encoding: unused
- * - decoding: Read by user.
+ * - decoding: set by libavcodec, read by user.
*/
- int width, height;
+ int64_t best_effort_timestamp;
/**
- * format of the frame, -1 if unknown or unset
- * It should be cast to the corresponding enum (enum PixelFormat
- * for video, enum AVSampleFormat for audio)
+ * reordered pos from the last AVPacket that has been input into the decoder
* Code outside libavcodec should access this field using:
- * av_opt_ptr(avcodec_get_frame_class(), frame, "format");
+ * av_opt_ptr(avcodec_get_frame_class(), frame, "pkt_pos");
* - encoding: unused
* - decoding: Read by user.
*/
- int format;
+ int64_t pkt_pos;
} AVFrame;