diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-24 02:57:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-24 02:57:18 +0100 |
| commit | e2cc39b6096ed4353293252e3955417b7766f161 (patch) | |
| tree | 0bc4d98c120dedcffb9b6e50943b4fc9e3c2a877 /libavcodec/a64enc.h | |
| parent | 32e74395a8e88dee1c149aeb36e7a21df431c181 (diff) | |
| parent | 31632e73f47d25e2077fce729571259ee6354854 (diff) | |
| download | ffmpeg-e2cc39b6096ed4353293252e3955417b7766f161.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
swf: check return values for av_get/new_packet().
wavpack: Don't shift minclip/maxclip
rtpenc: Expose the max packet size via an avoption
rtpenc: Move max_packet_size to a context variable
rtpenc: Add an option for not sending RTCP packets
lavc: drop encode() support for video.
snowenc: switch to encode2().
snowenc: don't abuse input picture for storing information.
a64multienc: switch to encode2().
a64multienc: don't write into output buffer when there's no output.
libxvid: switch to encode2().
tiffenc: switch to encode2().
tiffenc: properly forward error codes in encode_frame().
lavc: drop libdirac encoder.
gifenc: switch to encode2().
libvpxenc: switch to encode2().
flashsvenc: switch to encode2().
Remove libpostproc.
lcl: don't overwrite input memory.
swscale: take first/lastline over/underflows into account for MMX.
...
Conflicts:
.gitignore
Makefile
cmdutils.c
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdiracenc.c
libavcodec/libxvidff.c
libavcodec/qtrleenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavformat/mov.c
libavformat/movenc.c
libpostproc/Makefile
libpostproc/postprocess.c
libpostproc/postprocess.h
libpostproc/postprocess_altivec_template.c
libpostproc/postprocess_internal.h
libpostproc/postprocess_template.c
libswscale/swscale.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/a64enc.h')
| -rw-r--r-- | libavcodec/a64enc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/a64enc.h b/libavcodec/a64enc.h index fb559ba82b..4868461f40 100644 --- a/libavcodec/a64enc.h +++ b/libavcodec/a64enc.h @@ -50,6 +50,9 @@ typedef struct A64Context { uint8_t *mc_colram; uint8_t *mc_palette; int mc_pal_size; + + /* pts of the next packet that will be output */ + int64_t next_pts; } A64Context; #endif /* AVCODEC_A64ENC_H */ |