| 
							
							
								 James Almer | d34ec64a22 | replace calls to url_feof() with avio_feof() Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 00:48:38 +02:00 |  | 
			
				
					| 
							
							
								 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 |  |