Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 09:43:32 +0000 (11:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 09:43:32 +0000 (11:43 +0200)
commit018e0db5eff21d2b7e546bc63f4807dea782d00d
treee31a5976d3ff3f89d8403e6b8c475f97bcebd702
parentc6b425896541c6cc0b58c1aceb8821333f4049bc
parent09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9
Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'

* commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9':
  asfenc: remember send time and offset of the index entries

Conflicts:
libavformat/asfenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/asf.h
libavformat/asfenc.c