]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4abd5a4 e816aaa)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:25:10 +0000 (12:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 10:25:16 +0000 (12:25 +0200)
* qatar/master:
  apetag: use int64_t for filesize

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/apetag.c patch | diff1 | diff2 | blob | history

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