diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-08-20 23:11:26 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-08-20 23:11:26 +0000 |
| commit | 79de84f2634e60470183b9b314ecb7ed2264cc4c (patch) | |
| tree | ef6b94be5ffa67ae2c5a12cd30660e324faccda7 | |
| parent | 28f27e0c0c234ead2742510014132803f2511dc7 (diff) | |
Provide a simpler way for the user to reorder her timestamps.
Originally committed as revision 14871 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 21 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 21 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 29b500f711..a4cc3f4eb7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 51 -#define LIBAVCODEC_VERSION_MINOR 67 +#define LIBAVCODEC_VERSION_MINOR 68 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -767,7 +767,16 @@ typedef struct AVPanScan{ * - encoding: Set by user.\ * - decoding: Set by libavcodec.\ */\ - int8_t *ref_index[2]; + int8_t *ref_index[2];\ +\ + /**\ + * reordered opaque 64bit number (generally a PTS) from AVCodecContext.reordered_opaque\ + * output in AVFrame.reordered_opaque\ + * - encoding: unused\ + * - decoding: Read by user.\ + */\ + int64_t reordered_opaque;\ + #define FF_QSCALE_TYPE_MPEG1 0 #define FF_QSCALE_TYPE_MPEG2 1 @@ -2230,6 +2239,14 @@ typedef struct AVCodecContext { * - decoding: Set by user. */ float drc_scale; + + /** + * opaque 64bit number (generally a PTS) that will be reordered and + * output in AVFrame.reordered_opaque + * - encoding: unused + * - decoding: Set by user. + */ + int64_t reordered_opaque; } AVCodecContext; /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 39347c8bc2..fa5bf1a894 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -285,6 +285,8 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){ } s->internal_buffer_count++; + pic->reordered_opaque= s->reordered_opaque; + if(s->debug&FF_DEBUG_BUFFERS) av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p, %d buffers used\n", pic, s->internal_buffer_count); |