generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'

Browse Source 
* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
  asfdec: remove improper assignement that caused wrong timestamps

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-08-02 10:41:56 +02:00
parent 07094e5e40 33dc1913ab
commit 2ab827389b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/asfdec_o.c
View File

@@ -127,7 +127,6 @@ typedef struct ASFContext {
int64_t sub_dts; int64_t sub_dts;
uint8_t dts_delta; // for subpayloads uint8_t dts_delta; // for subpayloads
uint32_t packet_size_internal; // packet size stored inside ASFPacket, can be 0 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 int64_t packet_offset; // offset of the current packet inside Data Object
uint32_t pad_len; // padding after payload uint32_t pad_len; // padding after payload
uint32_t rep_data_len; 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) { if (asf->stream_index == asf->asf_st[i]->stream_index) {
asf_pkt = &asf->asf_st[i]->pkt; asf_pkt = &asf->asf_st[i]->pkt;
asf_pkt->stream_index = asf->asf_st[i]->index; asf_pkt->stream_index = asf->asf_st[i]->index;
asf_pkt->dts = asf->dts;
break; break;
} }
} }
@@ -1486,7 +1484,6 @@ static void reset_packet_state(AVFormatContext *s)
asf->nb_sub = 0; asf->nb_sub = 0;
asf->prop_flags = 0; asf->prop_flags = 0;
asf->sub_dts = 0; asf->sub_dts = 0;
asf->dts = 0;
for (i = 0; i < asf->nb_streams; i++) { for (i = 0; i < asf->nb_streams; i++) {
ASFPacket *pkt = &asf->asf_st[i]->pkt; ASFPacket *pkt = &asf->asf_st[i]->pkt;
pkt->size_left = 0; pkt->size_left = 0;