diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:44:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:45:05 +0100 |
| commit | e2f63be01284024a39a97dff9237eb4cbbb5dbbf (patch) | |
| tree | 292375339003cfe9adba551ae53e00ffa69207df /libavcodec/mpegvideo.h | |
| parent | ad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019 (diff) | |
| parent | e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4 (diff) | |
| download | ffmpeg-e2f63be01284024a39a97dff9237eb4cbbb5dbbf.tar.gz | |
Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'
* commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4':
mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext
Conflicts:
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 3b7c086834..cdd16067ca 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -585,7 +585,8 @@ typedef struct MpegEncContext { int custom_pcf; /* mpeg4 specific */ - int time_increment_bits; ///< number of bits to represent the fractional part of time + ///< number of bits to represent the fractional part of time (encoder only) + int time_increment_bits; int last_time_base; int time_base; ///< time in seconds of last I,P,S Frame int64_t time; ///< time of current frame |