[Ffmpeg-devel-irc] ffmpeg-devel.log.20120607

Fri Jun 8 02:05:03 CEST 2012

[01:44] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * r63040dcddd 10ffmpeg/configure: 
[01:44] <CIA-119> ffmpeg: configure: fix the wording for gpl incompatible licenses warnings
[01:44] <CIA-119> ffmpeg: calling the 4 clause BSD license non free is quite a stretch ;)
[01:44] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:44] <CIA-119> ffmpeg: (cherry picked from commit d5a17d7f4d03d174c0cc6111fed07ebded0ac6f3)
[01:44] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:44] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * r91fdba3d79 10ffmpeg/configure: 
[01:44] <CIA-119> ffmpeg: configure: disable avresample by default
[01:44] <CIA-119> ffmpeg: avresample is redundant and unneeded
[01:44] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:44] <CIA-119> ffmpeg: (cherry picked from commit f2bc2e89548706beee056f40036fc571ea817b80)
[01:44] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:44] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * r68efb539e3 10ffmpeg/configure: 
[01:44] <CIA-119> ffmpeg: configure: add asyncts->avresample dependancy
[01:44] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:44] <CIA-119> ffmpeg: (cherry picked from commit f0e39889ad4f418655e0b1bd89dade0d7143a9e3)
[01:44] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:44] <CIA-119> ffmpeg: 03Robert Nagy 07release/0.11 * r0e2b69b4e6 10ffmpeg/libavfilter/avcodec.c: 
[01:44] <CIA-119> ffmpeg: lavfi: Fill linesize, sample_rate and channel_layout fields in avfilter_fill_frame_from_audio_buffer_ref.
[01:44] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:44] <CIA-119> ffmpeg: (cherry picked from commit c2eae4bae7f5799c0f3cafb0cb189c420782f06c)
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * rc64bfd7c3d 10ffmpeg/libavfilter/ (avcodec.c buffer.c): 
[01:45] <CIA-119> ffmpeg: lavfi: use getter/setter functions for AVFrame.pkt_pos
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: (cherry picked from commit 59a78290b6fee4b52a28a43440dff6880d3102c2)
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * r56e987d2cd 10ffmpeg/libavformat/4xm.c: 
[01:45] <CIA-119> ffmpeg: 4xm: fix division by zero caused by bps<8
[01:45] <CIA-119> ffmpeg: Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: (cherry picked from commit 1b8741a6843f3f4667c81c2d63d3182858aa534f)
[01:45] <CIA-119> (233 lines omitted)
[01:45] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * r320704f739 10ffmpeg/libavcodec/utils.c: 
[01:45] <CIA-119> ffmpeg: av_get_audio_frame_duration: fix FPE
[01:45] <CIA-119> ffmpeg: Fixes ticket1392
[01:45] <CIA-119> ffmpeg: Found-by: Piotr Bandurski <ami_stuff at o2.pl>
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: (cherry picked from commit a5ad3c2382ac27cf712aaba6a222ec12f5eb88da)
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * re863d3306f 10ffmpeg/libavformat/oggdec.c: 
[01:45] <CIA-119> ffmpeg: oggdec: fix regression that caused reading the whole file during open
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: (cherry picked from commit e0eaf1004910e451cbb8dbcb5c54ac63721adb61)
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * rbbc4d287c9 10ffmpeg/libavcodec/ (intelh263dec.c ituh263dec.c): 
[01:45] <CIA-119> ffmpeg: h263: disable loop filter with lowres
[01:45] <CIA-119> ffmpeg: Fixes ticket1212
[01:45] <CIA-119> ffmpeg: Found-by: Piotr Bandurski <ami_stuff at o2.pl>
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: (cherry picked from commit cc229d4e83889d1298f1a0863b55feec6c5c339a)
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * r0e74b21427 10ffmpeg/libavcodec/ffv1.c: 
[01:45] <CIA-119> ffmpeg: ffv1dec: print more information for -debug 1
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: (cherry picked from commit 38c9ebd2a97a1298e4c5cc9d01d88d69c55be695)
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[01:45] <CIA-119> ffmpeg: 03Carl Eugen Hoyos 07release/0.11 * r4e66ca5f37 10ffmpeg/libavcodec/Makefile: 
[01:45] <CIA-119> ffmpeg: Fix ProRes decoder Makefile dependencies.
[01:45] <CIA-119> ffmpeg: Found, analysed and tested by trac user Jamal.
[01:45] <CIA-119> ffmpeg: Fixes part of Ticket #1404.
[01:45] <CIA-119> ffmpeg: (cherry picked from commit a4b885d55ee061fa8df089f356ddbabf0282da5f)
[01:45] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[10:06] <ubitux> michaelni: did Luca provide the DB?
[11:10] <ubitux> saste: please send a reminder 1 day before the #spi meeting :)
[11:13] <saste> ubitux: i'll do, if i remember ;-)
[11:16] <ubitux> :D
[11:16] <ubitux> thx :)
[12:32] <michaelni> ubitux, no DB
[12:34] <Compn> did we ever figure out what was sensitive about the db ?
[12:37] <michaelni> Compn, yes, theres nothing sensitive about it
[12:47] <burek> http://ffmpeg.org/trac/ffmpeg/ticket/1424#comment:2 :)
[12:49] <Compn> nice zigzag burek :)
[12:50] <burek> :) thanks :) it was with the help of a tutorial, but still, it looks nice and wasn't so difficult to create :)
[12:56] <Compn> i wonder if, in the future, theaters will use ffmpeg to play their digital films, due to too much drm on the files
[12:59] <burek> if there would be any theaters still left :)
[13:01] <Compn> haha
[13:11] <ubitux> michaelni: ok i'll ping him
[13:11] <ubitux> burek: heh nice :))
[13:11] <ubitux> maybe it's a bit too complex for a logo
[13:11] <ubitux> can't it be done in a more "cartoon" style?
[13:12] <ubitux> (maybe that's not what you want :))
[13:31] <burek> :)
[13:31] <burek> well it can, I just need to spend more time to figure out how to cartoonize it :)
[13:32] <burek> ubitux, do you have any examples, just to see what do you have on your mind? :)
[13:33] <ubitux> not really, but it looks a bit rigid and complex, with no real "mind-marking" outline
[13:34] <ubitux> maybe a "cartoon" isn't appropriate, but it was just an idea to "fix" these issues
[13:34] <burek> I see, so just to try to simplify it a little bit? :)
[13:34] <ubitux> of course, this is just my opinion, and i like this idea :)
[13:34] <ubitux> yes
[17:12] <CIA-119> ffmpeg: 03Nicolas George 07master * r9915a33fc2 10ffmpeg/libavfilter/audio.c: 
[17:12] <CIA-119> ffmpeg: lavfi/audio: fix size of copied samples.
[17:12] <CIA-119> ffmpeg: Fixes sporadic segfaults with some filters.
[17:23] <CIA-119> ffmpeg: 03Nicolas George 07master * r25e87fc5f6 10ffmpeg/ffmpeg.c: 
[17:23] <CIA-119> ffmpeg: ffmpeg: move keyboard interaction in a function.
[17:23] <CIA-119> ffmpeg: It makes the transcode loop easier to read (30% less code)
[17:23] <CIA-119> ffmpeg: and the differences with avconv easier to spot.
[18:01] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r5ee638fd54 10ffmpeg/libavcodec/svq1enc.c: 
[18:01] <CIA-119> ffmpeg: svq1enc: use av_assert
[18:01] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[18:01] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r23d8aaae46 10ffmpeg/libswscale/yuv2rgb.c: 
[18:01] <CIA-119> ffmpeg: yuv2rgb: remove assert() the codepath is not invalid
[18:01] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[19:38] <burek> mpegts muxer is broken I think
[19:39] <burek> no matter what I put into it and feed it over pipe to vlc it always gives pts dts errors like: [flv @ 0x213b740] Packets are not in the proper order with respect to DTS
[19:39] <burek> and [0x1c71cf8] avformat mux error: could not write frame (pts: 160002, dts: 40001) (pkt pts: 160, dts: 40)
[19:39] <burek> even when I tried with rawvideo/audio it gave similar error: Application provided invalid, non monotonically increasing dts to muxer in stream 2: 386784 >= 386782         av_interleaved_write_frame(): Invalid argument
[20:16] <michaelni> burek, how exactly can i reproduce this ?
[20:17] <burek> hmh, let me give you my example
[20:18] <burek> http://pastebin.com/A6dzae5z
[20:19] <burek> here is the output too http://pastebin.com/99s0jkUu
[20:19] <burek> I've tried to fix it with -vsync drop
[20:19] <burek> to tell muxer to generate fresh timestamps
[20:19] <burek> but it returned: av_interleaved_write_frame(): Invalid argument
[20:20] <michaelni> is this specific to alsa + v4l2 input ?
[20:21] <michaelni> if not please provide an example with files
[20:21] <burek> how can I test it to eliminate all the other options except mpegts muxer
[20:21] <michaelni> i tried 2 files and i so nothing odd
[20:21] <michaelni> i tried this : ./ffmpeg -i tests/data/fate/vsynth1-huffyuv.avi  -i tests/data/fate/acodec-mp2.mp2  -f mpegts - | vlc -
[20:22] <burek> I've noticed that mpeg1video and mp2 audio works good
[20:22] <burek> but libx264 + aac or even just x264 or just aac doesn't
[20:23] <michaelni> this works too: ./ffmpeg -i tests/data/fate/vsynth1-huffyuv.avi -vcodec libx264  -f mpegts - | vlc -
[20:25] <burek> try with aac audio
[20:25] <burek> or mp3
[20:27] <michaelni> this works to: ./ffmpeg -i tests/data/fate/acodec-mp2.mp2 -acodec libmp3lame  -f mpegts - | vlc -
[20:28] <burek> and both x264 + audio?
[20:28] <michaelni> sorry
[20:28] <michaelni> please provide a testcase
[20:28] <burek> ok
[20:28] <michaelni> i dont have time to guess what you talk about
[20:52] <burek> michaelni, would it helped if I would just save -f mpegts to out.ts and upload it so you can test with it?
[20:55] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r107b42388c 10ffmpeg/libavformat/utils.c: 
[20:55] <CIA-119> ffmpeg: lavf: fix missing "parser not found" message
[20:55] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[20:55] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r3422e7c395 10ffmpeg/libavcodec/rectangle.h: 
[20:55] <CIA-119> ffmpeg: lavc/rectangle: change assert to av_assert
[20:55] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[20:57] <michaelni> burek, if the bug is in the muxing of that file then no. If that file is the input to ffmpeg which then produces buggy output then yes
[20:58] <burek> well, I just used out.ts as an output file instead of pipe and piped it to vlc and it complained as usual, so I was thinking that you might get the proof that it indeed creates a bad mpegts output
[20:58] <burek> I mean I started vlc as out.ts as an input and the errors reappeared all the same
[20:59] <michaelni> well i dont doubt you that theres a bug ...
[20:59] <michaelni> but i need to be able to reproduce it
[20:59] <michaelni> i mean the step that turns good input to bad output
[21:00] <burek> I never succeeded so far to put libx264+aac (no matter is it just -f aac or -f libaacplus or -acodec copy of some aac audio) into mpegts so that vlc wouldn't complain
[21:00] <burek> so I'm pretty sure that combination is somehow problematic
[21:01] <burek> can you tell me what do you need and I'll create samples
[21:01] <burek> if you want I'll give you shell access if that would make testing easier, so you can test whatever you need
[21:02] <michaelni> you say libx264+aa in mpegts is problematic, if so i need a input file to ffmpeg and the command line you used to create such a problematic mpegts
[21:03] <michaelni> + the error messages from vlc
[21:03] <michaelni> it could even be that i just have a different vlc version that is less picky
[21:04] <michaelni> so i need to know the vlc version too just in case
[21:04] <burek> ok
[21:11] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r610a52647b 10ffmpeg/libavformat/xmv.c: 
[21:11] <CIA-119> ffmpeg: xmv: use av_assert
[21:11] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[21:11] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r4e3fc46828 10ffmpeg/libavcodec/h264_mvpred.h: 
[21:11] <CIA-119> ffmpeg: h264_mvpred: use av_assert
[21:11] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[21:35] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r07732b4f09 10ffmpeg/libavcodec/h261dec.c: 
[21:35] <CIA-119> ffmpeg: h261dec: use av_assert
[21:35] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[21:35] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * ra21c212681 10ffmpeg/libavformat/swfenc.c: 
[21:35] <CIA-119> ffmpeg: swfenc: use av_assert
[21:35] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[21:35] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * rb4d44367bc 10ffmpeg/libavcodec/h261enc.c: 
[21:35] <CIA-119> ffmpeg: h261enc: use av_assert
[21:35] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[21:46] <burek> woohoo.. segfault... I give up.. I'll continue tomorrow.. can't keep my head up anymore :S
[21:48] <michaelni> burek, sleep well then  :)
[21:50] <CIA-119> ffmpeg: 03Mans Rullgard 07master * rd0e9415d23 10ffmpeg/tests/ (Makefile rotozoom.c videogen.c): 
[21:50] <CIA-119> ffmpeg: fate: avoid freopen(NULL) in videogen/rotozoom
[21:50] <CIA-119> ffmpeg: A number of systems do not implement freopen() with a NULL filename
[21:50] <CIA-119> ffmpeg: correctly. This changes these programs to output individual images
[21:50] <CIA-119> ffmpeg: if opening a named output argument as a file fails, in this case
[21:50] <CIA-119> ffmpeg: assuming it is a directory.
[21:50] <CIA-119> ffmpeg: Signed-off-by: Mans Rullgard <mans at mansr.com>
[21:50] <CIA-119> ffmpeg: 03Alex Converse 07master * ra8656cd425 10ffmpeg/libavformat/mpegts.c: mpegts: Remove disabled extension matching probe.
[21:50] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * r67732b9d62 10ffmpeg/: (log message trimmed)
[21:50] <CIA-119> ffmpeg: Merge remote-tracking branch 'qatar/master'
[21:50] <CIA-119> ffmpeg: * qatar/master:
[21:50] <CIA-119> ffmpeg:  mpegts: Remove disabled extension matching probe.
[21:50] <CIA-119> ffmpeg:  fate: avoid freopen(NULL) in videogen/rotozoom
[21:50] <CIA-119> ffmpeg: Conflicts:
[21:52] <burek> :beer: :)
[21:58] <funman> michaelni: which vlc version do you run?
[22:00] <CIA-119> ffmpeg: 03Marton Balint 07master * r1372c826de 10ffmpeg/ffplay.c: 
[22:00] <CIA-119> ffmpeg: ffplay: use dummy video driver if display is disabled
[22:00] <CIA-119> ffmpeg: Fixes ticket 1402.
[22:00] <CIA-119> ffmpeg: Signed-off-by: Marton Balint <cus at passwd.hu>
[22:00] <CIA-119> ffmpeg: 03Michael Niedermayer 07master * rc9651d4bee 10ffmpeg/ffplay.c: 
[22:00] <CIA-119> ffmpeg: ffplay: fix use after free
[22:00] <CIA-119> ffmpeg: reproduceable with:
[22:00] <CIA-119> ffmpeg: ffmpeg -i tests/lena.pnm -pix_fmt pal8 -vcodec rawvideo -s 512x512 out.avi
[22:00] <CIA-119> ffmpeg: valgrind ffplay_g out.avi
[22:00] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[22:00] <CIA-119> ffmpeg: Signed-off-by: Marton Balint <cus at passwd.hu>
[22:00] <CIA-119> ffmpeg: 03Marton Balint 07master * r0a501c756f 10ffmpeg/ffplay.c: 
[22:00] <CIA-119> ffmpeg: ffplay: fix frame aspect ratio after qatar merge
[22:00] <CIA-119> ffmpeg: Signed-off-by: Marton Balint <cus at passwd.hu>
[22:00] <CIA-119> ffmpeg: 03Marton Balint 07master * re85df18d74 10ffmpeg/ffplay.c: 
[22:00] <CIA-119> ffmpeg: ffplay: add support for changing pixel format
[22:00] <CIA-119> ffmpeg: With the filtering code refactored, it was much easier to finally fix this.
[22:00] <CIA-119> ffmpeg: Fixes ticket 123 and 238.
[22:00] <CIA-119> ffmpeg: Signed-off-by: Marton Balint <cus at passwd.hu>
[22:00] <CIA-119> ffmpeg: 03Marton Balint 07master * ra78bc6f78c 10ffmpeg/ffplay.c: 
[22:01] <CIA-119> ffmpeg:  ffplay: add support for changing pixel format
[22:01] <CIA-119> ffmpeg:  ffplay: add missing filt_in assignment after video filter reconfigure
[22:01] <CIA-119> ffmpeg: 03Marton Balint 07master * rcd947e9a2b 10ffmpeg/ffplay.c: 
[22:01] <CIA-119> ffmpeg: ffplay: add missing filt_in assignment after video filter reconfigure
[22:01] <CIA-119> ffmpeg: Fixes segfaults on changing resolution.
[22:01] <CIA-119> ffmpeg: Signed-off-by: Marton Balint <cus at passwd.hu>
[22:01] <michaelni> funman, VLC media player 1.3.0-git Rincewind (revision 1.3.0-git-134-g47c8b03)
[22:02] <michaelni> i should build a new one
[22:02] <funman> yeah we renamed this one to 2.1
[22:03] <funman> your version doesn't have the bugs we added in git since
[22:03] <funman> 1.3.0-git-2773-g3e87f59
[22:03] <funman> ah but git describe still says 1.3.0 since there is no 2.1.0 tag yet ..
[22:26] <CIA-119> ffmpeg: 03Nicolas George 07master * rd9b0d75c56 10ffmpeg/libavutil/ (opt.c opt.h): opt: add AV_OPT_TYPE_PIXEL_FMT.
[22:26] <CIA-119> ffmpeg: 03Nicolas George 07master * r42b774ab6f 10ffmpeg/libavutil/opt.c: 
[22:26] <CIA-119> ffmpeg: opt: init test_ctx to 0.
[22:26] <CIA-119> ffmpeg: Otherwise, setting string will try to free a random address.
[22:26] <CIA-119> ffmpeg: 03Nicolas George 07master * r61c266d72f 10ffmpeg/libavutil/opt.c: 
[22:26] <CIA-119> ffmpeg: opt: free test_ctx.string at the end.
[22:26] <CIA-119> ffmpeg: Makes valgrind happy.
[22:26] <CIA-119> ffmpeg: 03Nicolas George 07master * r9148ae5b91 10ffmpeg/libavutil/opt.c: opt: add test for IMAGE_SIZE and PIXEL_FMT.
[22:59] <CIA-119> ffmpeg: 03Michael Niedermayer 07release/0.11 * r39fe8033bb 10ffmpeg/ (Doxyfile RELEASE VERSION): 
[22:59] <CIA-119> ffmpeg: Update for 0.11.1
[22:59] <CIA-119> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
[23:03] <CIA-119> ffmpeg: 03Nicolas George 07master * rb3e2bb08a9 10ffmpeg/libavutil/ (bprint.c bprint.h): bprint: add av_bprint_init_for_buffer().
[23:03] <CIA-119> ffmpeg: 03Nicolas George 07master * r7a2b429175 10ffmpeg/tests/ (fate/libavutil.mak ref/fate/bprint): fate: add bprint test.
[23:03] <CIA-119> ffmpeg: 03Nicolas George 07master * re8e492b302 10ffmpeg/libavfilter/af_amerge.c: 
[23:03] <CIA-119> ffmpeg: af_amerge: move nb_in_ch into the in structure.
[23:03] <CIA-119> ffmpeg: With that change, there is only one array for the inputs,
[23:03] <CIA-119> ffmpeg: it will make easier to implement a variable number of inputs.
[23:03] <CIA-119> ffmpeg: 03Nicolas George 07master * re0545262a2 10ffmpeg/ (doc/filters.texi libavfilter/af_amerge.c): amerge: accept multiple inputs.
[23:03] <CIA-119> ffmpeg: 03Nicolas George 07master * re45a92dc88 10ffmpeg/libavutil/ (audioconvert.c audioconvert.h): 
[23:03] <CIA-119> ffmpeg: audioconvert: implement av_bprint_channel_layout().
[23:03] <CIA-119> ffmpeg: And reimplement av_get_channel_layout_string() on top of it.
[23:29] <CIA-119> ffmpeg: 03Nicolas George 07master * r6668ef7567 10ffmpeg/cmdutils.c: 
[23:29] <CIA-119> ffmpeg: cmdutils: include threading caps in codecs listing.
[23:29] <CIA-119> ffmpeg: Suggested by Roger Pack on ffmpeg-user.
[00:00] --- Fri Jun  8 2012