]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07094e5 33dc191)
Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:56 +0000 (10:41 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:56 +0000 (10:41 +0200)
* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
  asfdec: remove improper assignement that caused wrong timestamps

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/asfdec_o.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/asfdec_o.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.