# HG changeset patch # User michael # Date 1219273886 0 # Node ID b5b4bf0944b88410839260a68078e6d67eca5234 # Parent d6390123201dc79949fe5252ec50cbb67a122b83 Provide a simpler way for the user to reorder her timestamps. diff -r d6390123201d -r b5b4bf0944b8 avcodec.h --- a/avcodec.h Wed Aug 20 17:05:14 2008 +0000 +++ b/avcodec.h Wed Aug 20 23:11:26 2008 +0000 @@ -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 @@ * - 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 @@ * - 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 -r d6390123201d -r b5b4bf0944b8 utils.c --- a/utils.c Wed Aug 20 17:05:14 2008 +0000 +++ b/utils.c Wed Aug 20 23:11:26 2008 +0000 @@ -285,6 +285,8 @@ } 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);