]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1bfb99 a079795)
Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 31 Jul 2015 09:56:22 +0000 (11:56 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 31 Jul 2015 09:56:42 +0000 (11:56 +0200)
* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
  fate/mp3: specify the number of output samples instead of filesize

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
tests/fate/mp3.mak patch | diff1 | diff2 | blob | history

diff --cc tests/fate/mp3.mak
Simple merge
Unnamed repository; edit this file 'description' to name the repository.