eden-emu/FFmpeg
15
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-06 15:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Provide a simpler way for the user to reorder her timestamps.

Browse source 
Originally committed as revision 14871 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-08-20 23:11:26 +00:00
parent 28f27e0c0c
commit 79de84f263
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libavcodec/avcodec.h
View file

@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 51 #define LIBAVCODEC_VERSION_MAJOR 51
#define LIBAVCODEC_VERSION_MINOR 67 #define LIBAVCODEC_VERSION_MINOR 68
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@ -767,7 +767,16 @@ typedef struct AVPanScan{
* - encoding: Set by user.\ * - encoding: Set by user.\
* - decoding: Set by libavcodec.\ * - 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_MPEG1 0
#define FF_QSCALE_TYPE_MPEG2 1 #define FF_QSCALE_TYPE_MPEG2 1
@ -2230,6 +2239,14 @@ typedef struct AVCodecContext {
* - decoding: Set by user. * - decoding: Set by user.
*/ */
float drc_scale; 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; } AVCodecContext;
/** /**

2
libavcodec/utils.c
View file

@ -285,6 +285,8 @@ int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic){
} }
s->internal_buffer_count++; s->internal_buffer_count++;
pic->reordered_opaque= s->reordered_opaque;
if(s->debug&FF_DEBUG_BUFFERS) 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); av_log(s, AV_LOG_DEBUG, "default_get_buffer called on pic %p, %d buffers used\n", pic, s->internal_buffer_count);