RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-20 22:06:59 +00:00
Code Issues Projects Releases Wiki Activity
65,323 Commits 37 Branches 400 Tags 272 MiB
def03d3439
Commit Graph

2 Commits

Author SHA1 Message Date
Michael Niedermayer
a9ce5d92e6 Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1' 
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
  daud: split muxer and demuxer

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 21:42:16 +02:00
Nidhi Makhijani
0955e57ad0 daud: split muxer and demuxer 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-03 10:46:11 -07:00