Michael Niedermayer de2cfb744a Merge remote-tracking branch 'qatar/master' ... * qatar/master: pcmenc: set correct bitrate value avprobe: don't print format entry name when only one was requested Conflicts: ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-05-17 23:45:00 +02:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-05-17 23:45:00 +02:00
fate	ffmpeg: add support for audio filters.	2012-05-17 03:29:21 +02:00
lavf	Merge remote-tracking branch 'qatar/master'	2012-05-17 23:45:00 +02:00
lavf-fate	latmenc: copy pce config from proper location.	2012-04-12 20:28:37 +02:00
lavfi	Support yuva422p rawvideo in nut.	2012-05-08 10:37:13 +02:00
seek	Merge remote-tracking branch 'qatar/master'	2012-05-17 23:45:00 +02:00
vsynth1	Merge remote-tracking branch 'qatar/master'	2012-05-16 22:32:05 +02:00
vsynth2	Merge remote-tracking branch 'qatar/master'	2012-05-16 22:32:05 +02:00