xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-13 22:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,167 Commits 31 Branches 338 Tags 298 MiB
a4f50ec9dd
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