comparison avcodec.h @ 1831:cd2d7fcfab7a libavcodec

use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0 move AV_NOPTS_VALUE & AV_TIME_BASE from avformat.h -> avcodec.h related fixes
author michael
date Wed, 25 Feb 2004 17:35:52 +0000
parents 6d762acfff5d
children ac9e8597c2b7
comparison
equal deleted inserted replaced
1830:024752284c25 1831:cd2d7fcfab7a
15 #include "rational.h" 15 #include "rational.h"
16 #include <sys/types.h> /* size_t */ 16 #include <sys/types.h> /* size_t */
17 17
18 #define FFMPEG_VERSION_INT 0x000408 18 #define FFMPEG_VERSION_INT 0x000408
19 #define FFMPEG_VERSION "0.4.8" 19 #define FFMPEG_VERSION "0.4.8"
20 #define LIBAVCODEC_BUILD 4703 20 #define LIBAVCODEC_BUILD 4704
21 21
22 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT 22 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
23 #define LIBAVCODEC_VERSION FFMPEG_VERSION 23 #define LIBAVCODEC_VERSION FFMPEG_VERSION
24 24
25 #define AV_STRINGIFY(s) AV_TOSTRING(s) 25 #define AV_STRINGIFY(s) AV_TOSTRING(s)
26 #define AV_TOSTRING(s) #s 26 #define AV_TOSTRING(s) #s
27 #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" AV_STRINGIFY(LIBAVCODEC_BUILD) 27 #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" AV_STRINGIFY(LIBAVCODEC_BUILD)
28
29 #define AV_NOPTS_VALUE INT64_MIN
30 #define AV_TIME_BASE 1000000
28 31
29 enum CodecID { 32 enum CodecID {
30 CODEC_ID_NONE, 33 CODEC_ID_NONE,
31 CODEC_ID_MPEG1VIDEO, 34 CODEC_ID_MPEG1VIDEO,
32 CODEC_ID_MPEG2VIDEO, /* prefered ID for MPEG Video 1 or 2 decoding */ 35 CODEC_ID_MPEG2VIDEO, /* prefered ID for MPEG Video 1 or 2 decoding */
370 * - decoding: set by lavc\ 373 * - decoding: set by lavc\
371 */\ 374 */\
372 int pict_type;\ 375 int pict_type;\
373 \ 376 \
374 /**\ 377 /**\
375 * presentation timestamp in micro seconds (time when frame should be shown to user)\ 378 * presentation timestamp in AV_TIME_BASE (=micro seconds currently) (time when frame should be shown to user)\
376 * if 0 then the frame_rate will be used as reference\ 379 * if AV_NOPTS_VALUE then the frame_rate will be used as reference\
377 * - encoding: MUST be set by user\ 380 * - encoding: MUST be set by user\
378 * - decoding: set by lavc\ 381 * - decoding: set by lavc\
379 */\ 382 */\
380 int64_t pts;\ 383 int64_t pts;\
381 \ 384 \