diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-13 01:07:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-13 01:29:48 +0100 |
| commit | b18e17eabf3ba51da2d0fd0f85c4815945bfd70a (patch) | |
| tree | e949920e01cba93fbedca647076f72b31eec59cb /libavformat/ffmenc.c | |
| parent | a2c419848df3e76e164bd19c3841f39d2971d326 (diff) | |
| parent | 4df30f71147b7bedd4457bcfa0e4efe01085af9f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
utils: Check for extradata size overflows.
ARM: rv34: fix asm syntax in dc transform functions
avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
rv34: fix and optimise frame dependency checking
rv34: NEON optimised dc only inverse transform
avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
ffmenc: remove references to deprecated AVFormatContext.timestamp.
lavf: undeprecate read_seek().
avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
lavc: ifdef out parse_only AVOption
nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
riff: remove references to sonic codec ids
indeo4: add some missing static and const qualifiers
rv34: DC-only inverse transform
avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
lavfi: move version macros to a new installed header version.h
vsrc_buffer: release the buffer on uninit.
rgb2rgb: rgb12tobgr12()
...
Conflicts:
avconv.c
doc/APIchanges
ffprobe.c
libavfilter/Makefile
libavfilter/avfilter.h
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmenc.c')
| -rw-r--r-- | libavformat/ffmenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index cd4ee61326..69d924d09c 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -207,7 +207,7 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t header[FRAME_HEADER_SIZE+4]; int header_size = FRAME_HEADER_SIZE; - dts = s->timestamp + pkt->dts; + dts = pkt->dts; /* packet size & key_frame */ header[0] = pkt->stream_index; header[1] = 0; @@ -215,7 +215,7 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt) header[1] |= FLAG_KEY_FRAME; AV_WB24(header+2, pkt->size); AV_WB24(header+5, pkt->duration); - AV_WB64(header+8, s->timestamp + pkt->pts); + AV_WB64(header+8, pkt->pts); if (pkt->pts != pkt->dts) { header[1] |= FLAG_DTS; AV_WB32(header+16, pkt->pts - pkt->dts); |