]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b04b021 7f388c0)
Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 10:44:56 +0000 (12:44 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 10:45:00 +0000 (12:45 +0200)
* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
  asfdec: remove the wrong condition

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
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.