diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:41:56 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:41:56 +0200 |
| commit | 2ab827389bc17972dfe58b768083593b1f1bf776 (patch) | |
| tree | b6adba825e499dfbe3babf193ea419650203b7f9 /libavformat | |
| parent | 07094e5e405408df593d16421286bb9eb4188365 (diff) | |
| parent | 33dc1913ab7aaefc991b3e665d1d0b5d0b088672 (diff) | |
| download | ffmpeg-streaming-2ab827389bc17972dfe58b768083593b1f1bf776.zip ffmpeg-streaming-2ab827389bc17972dfe58b768083593b1f1bf776.tar.gz | |
Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'
* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
asfdec: remove improper assignement that caused wrong timestamps
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfdec_o.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index d53e271..0649fc9 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -127,7 +127,6 @@ typedef struct ASFContext { int64_t sub_dts; uint8_t dts_delta; // for subpayloads uint32_t packet_size_internal; // packet size stored inside ASFPacket, can be 0 - int64_t dts; int64_t packet_offset; // offset of the current packet inside Data Object uint32_t pad_len; // padding after payload uint32_t rep_data_len; @@ -1248,7 +1247,6 @@ static int asf_read_payload(AVFormatContext *s, AVPacket *pkt) if (asf->stream_index == asf->asf_st[i]->stream_index) { asf_pkt = &asf->asf_st[i]->pkt; asf_pkt->stream_index = asf->asf_st[i]->index; - asf_pkt->dts = asf->dts; break; } } @@ -1486,7 +1484,6 @@ static void reset_packet_state(AVFormatContext *s) asf->nb_sub = 0; asf->prop_flags = 0; asf->sub_dts = 0; - asf->dts = 0; for (i = 0; i < asf->nb_streams; i++) { ASFPacket *pkt = &asf->asf_st[i]->pkt; pkt->size_left = 0; |
