]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b940145 9e8627a)
Merge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 10:27:32 +0000 (12:27 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 10:27:35 +0000 (12:27 +0200)
* commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe':
  asfdec: interpret the first flag in an asf packet as length flag

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.