[00:40] <CIA-17> ffmpeg: 03Luca Barbato 07master * r8b97ae6484 10ffmpeg/libavformat/utils.c: [00:40] <CIA-17> ffmpeg: avf: fix faulty check in has_duration [00:40] <CIA-17> ffmpeg: An invalid duration is AV_NOPTS_VALUE not 0. [00:40] <CIA-17> ffmpeg: 03Hendrik Leppkes 07master * r949d942eef 10ffmpeg/libavformat/isom.c: [00:40] <CIA-17> ffmpeg: mov: support eac3 audio [00:40] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [00:40] <CIA-17> ffmpeg: Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> [00:40] <CIA-17> ffmpeg: 03Mans Rullgard 07master * rdac78fd1d7 10ffmpeg/libavcodec/arm/asm.S: [00:40] <CIA-17> ffmpeg: ARM: add some compatibility macros [00:40] <CIA-17> ffmpeg: This adds some macros simplifying Thumb and pre-v6T2 compatibility. [00:40] <CIA-17> ffmpeg: Signed-off-by: Mans Rullgard <mans@mansr.com> [00:40] <CIA-17> ffmpeg: 03Mans Rullgard 07master * rb692d246ea 10ffmpeg/libavcodec/arm/ (7 files): [00:40] <CIA-17> ffmpeg: vp8: arm: separate ARMv6 functions from NEON [00:40] <CIA-17> ffmpeg: This is a preparation for complete ARMv6 optimisations. [00:40] <CIA-17> ffmpeg: Signed-off-by: Mans Rullgard <mans@mansr.com> [00:40] <CIA-17> ffmpeg: 03Mans Rullgard 07master * re4ac031233 10ffmpeg/libavcodec/arm/ (vp8dsp_armv6.S vp8dsp_init_armv6.c): [00:40] <CIA-17> ffmpeg: vp8: armv6 optimisations [00:40] <CIA-17> ffmpeg: Based on patch by Ronald S. Bultje <rsbultje@gmail.com>, [00:40] <CIA-17> ffmpeg: partially ported from libvpx. [00:40] <CIA-17> ffmpeg: Signed-off-by: Mans Rullgard <mans@mansr.com> [00:40] <CIA-17> ffmpeg: 03Mans Rullgard 07master * r3d11c2d76d 10ffmpeg/libavcodec/arm/vp8dsp_armv6.S: [00:40] <CIA-17> ffmpeg: vp8: armv6: fix non-armv6t2 build [00:40] <CIA-17> ffmpeg: The assembler may fail to place literal pools close enough to [00:41] <CIA-17> ffmpeg: instructions referencing them. An explicit .ltorg directive [00:41] <CIA-17> ffmpeg: fixes this. [00:41] <CIA-17> ffmpeg: Signed-off-by: Mans Rullgard <mans@mansr.com> [00:41] <CIA-17> ffmpeg: 03Mans Rullgard 07master * r3527a73933 10ffmpeg/ (5 files in 3 dirs): [00:41] <CIA-17> ffmpeg: avutil: add av_parse_cpu_flags() function [00:41] <CIA-17> (32 lines omitted) [00:42] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * r76d376d99b 10ffmpeg/libswresample/swresample_test.c: [00:42] <CIA-17> ffmpeg: swr-test: fix declaration statement ordering. [00:42] <CIA-17> ffmpeg: swr-test is now warning free. [00:42] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [00:42] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * r7b2ce50701 10ffmpeg/libswresample/swresample_test.c: [00:42] <CIA-17> ffmpeg: swr-test: fix unused var warnings [00:42] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [00:42] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * ra0dd81dd95 10ffmpeg/libswresample/swresample_test.c: [00:42] <CIA-17> ffmpeg: swr-test:indent [00:42] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [00:42] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * rf75169b251 10ffmpeg/libswresample/swresample_test.c: [00:42] <CIA-17> ffmpeg: swr-test: fix pointer type warnings [00:42] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [04:58] <Daemon404> lovely [04:58] <Daemon404> ffmpeg fails to build with mingw/msys due to library.mak [05:00] <Daemon404> olol, it's a problem with line endings [05:00] <Daemon404> stupid msysgit [05:06] <Compn> hehehe [05:06] <Compn> ran into that once or twice :P [05:11] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * rbbd3dc49ff 10ffmpeg/libswresample/audioconvert.c: [05:11] <CIA-17> ffmpeg: swr: unroll audioconvert core C function [05:11] <CIA-17> ffmpeg: 36k->32k decicycles [05:11] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [05:11] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * r4119fa7023 10ffmpeg/libswresample/audioconvert.c: [05:11] <CIA-17> ffmpeg: swr: audioconvert, mark some constants as floats. [05:11] <CIA-17> ffmpeg: idea from avr [05:11] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [06:06] <Compn> dang [06:06] <Compn> http://stream-recorder.com/forum/adobe-hds-fragment-joiner-t12074.html [06:07] <Compn> ksv coded up a adobe f4f demuxer :) [06:07] <Daemon404> f4f? [06:08] <Compn> stupid adobe http dynamic streaming fragmented file [06:08] <Daemon404> oic [06:08] <Daemon404> also lol [06:08] <Daemon404> its written in php [06:09] <Compn> cross-platform :P [06:09] <Compn> ehe [06:09] <Daemon404> it's using a regex to match hex chars [06:09] <Daemon404> o god [06:13] <Compn> Daemon404 : looks like you want to make an f4f demuxer for ffmpeg :) [06:14] <Compn> i think i have samples if you want [06:14] <Daemon404> it looks simple [06:14] <Daemon404> i certainly dont have time right now though [06:14] <Daemon404> moving to NYC [06:14] <Compn> sounds like funm [06:15] Action: Compn afk [06:15] <Daemon404> lul [11:20] <CIA-17> ffmpeg: 03Nicolas George 07master * re5474f5c48 10ffmpeg/doc/ (ffmpeg.texi filters.texi): [11:20] <CIA-17> ffmpeg: doc: fix syntax for durations and timestamps. [11:20] <CIA-17> ffmpeg: Omitting the seconds has not worked for a long time, if ever. [11:20] <CIA-17> ffmpeg: Omitting the minutes too is just nonsensical for a duration [11:20] <CIA-17> ffmpeg: (it is indistinguishable from just seconds). [12:29] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * rdcfc12e86a 10ffmpeg/libswresample/swresample_test.c: [12:29] <CIA-17> ffmpeg: swr-test: simplify prng code [12:29] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [13:45] <Shimmy> Any please help me urgently: https://ffmpeg.org/trac/ffmpeg/ticket/747 [13:54] <Compn> why not use the amv-codec-tools to convert your files ? [13:55] <michaelni> Shimmy, id love to but i have no hardware to test the validity of such encoded streams [13:55] <michaelni> and i dont want to just write it blindly and hope it wont be totally buggy [13:56] <Compn> michaelni : just mark it experimental and wait for bug reports ;) [13:56] <Shimmy> What do you mean you don't have hardware [13:56] <Compn> Shimmy : he doesnt have amv player [13:56] <Compn> do you have amv player software he can test his encoder with ? [13:56] <ubitux> send him a s1mp3 player :) [13:56] <Shimmy> I will give you everything, yes, I have. [13:56] <Compn> michaelni : do you mind testing an encoder against a software amv player ? [13:57] <JEEB> also, I think that's just one of the Chinese "amv" formats :D (IIRC there was some other format, too) [13:57] <Shimmy> Also take into account that it's already done, as I said in that post there is already an open source amv converter, the problem is it doens't work with the new versions of ffmpeg, I need someone to merge the encoder from that open source project (it's ffmpeg-based) into ffmpeg itself. [13:58] <JEEB> Shimmy, as far as I read the old stuff, it wasn't exactly nicely written :P [13:58] <JEEB> so a partial/full rewrite would be needed [13:59] <Shimmy> I have a closed-source windows software that plays amv files, if that player plays the file, I can assum it's gonna play on my hardware (i will convert using the required parameters necessary for my device) amv support a limited range anyway, so the testing job is minor. [14:00] <Shimmy> @JEEB what wasn't nicely written, that open source project? [14:00] <JEEB> the amv-codec-tools thingy [14:00] <Shimmy> aha. [14:01] <JEEB> also, never ever underestimate testing [14:02] <JEEB> the format has no open spec, and it's just a weirdly limited version of MJPEG + ADPCM [14:02] <Shimmy> if i would only know C i would get into it and do it myself. I learned some C, but from learning a bit C to developing an encoder is huge distance :) [14:02] <Shimmy> BTW, the issue, is only with the audio, it's "adpcm_ima_amv" [14:03] <michaelni> Shimmy, ill try to look into the stuff when i have time and post a version for testing [14:03] <Shimmy> and it has decoding support in ffmpeg, but no encoding [14:03] <michaelni> but dunno when ive time [14:03] <Shimmy> michalni, can i contact u privately [14:03] <Shimmy> here in irc [16:56] <ubitux> i'm looking at porting the -async option to an audio filter [16:56] <ubitux> from what i can tell, it just needs the input pts, which lavfi is aware of [16:56] <ubitux> the filter would just "scale" the audio according to this [16:57] <ubitux> (drop samples or insert silence) [16:57] <ubitux> am i missing something? [16:58] <av500> insert silence? [16:58] <av500> that would sound awesome [16:58] <av500> or awful? [17:00] <ubitux> i just want to move the -async option to lavfi [17:00] <ubitux> because it's blocking for the audio filtering in ffmpeg [17:00] <ubitux> there is also the filter reconfiguration to do afaik [17:01] <ubitux> but async is one of the blocking thing [17:01] <ubitux> and i want to move on on this [17:11] <ubitux> also the 3nd thing to do (but not blocking for -af) would be to have the asetframesize filter proposed a while ago, which would add silence padding for the last frame [17:12] <ubitux> it would simplifies the flushing in ffmpeg.c, as well as the frame writing in do_audio_out [17:14] <saste> ubitux: what was the issue with asetframesize? [17:14] <ubitux> dunno, i think there was a tricky poll_frame() [17:14] <ubitux> also, it didn't add silence iirc [17:16] <ubitux> anyway, if all of this is ported to lavfi, we would just need to have an audio configuration like abuffer=...,aresample=...,async=...,volume=...,pan=...,asetframesize=... and all the audio stuff in ffmpeg.c could be drop [17:16] <ubitux> and we will be able to add -af, audio filtering in complex filters etc [17:19] <ubitux> right now we have most of the features duplicated (resample, volume, channel mapping, frame sample buffering, etc) [18:16] <CIA-17> ffmpeg: 03Nicolas George 07master * r3e1d3ebf5e 10ffmpeg/libavutil/parseutils.c: [18:16] <CIA-17> ffmpeg: parseutils: replace setenv() by putenv(). [18:16] <CIA-17> ffmpeg: putenv() seems to be more portable. [19:02] <ubitux> internet is back, i can live again [19:04] <burek> :) [19:30] <burek> what tool can generally be used to copy metadata from one media file to another, like copy/paste [19:40] <saste> burek: http://ffmpeg.org/ffmpeg.html#Metadata [19:40] <saste> there is a metadata muxer/demuxer, you need some layer of scripting though [19:41] <ubitux> when ffmpeg will support json as input metadata file, you should be able to do nasty piping with ffprobe [19:41] <ubitux> shouldn't happen soon though [19:42] <burek> saste, thanks :) this is really cool :) [19:43] <burek> err.. how is this thing used? ffmpeg -i ... -f metadata out.txt ? [19:44] <ubitux> i'd say you extract the metadata with ffprobe [19:44] <ubitux> and then convert it to a ffmpeg cmd line with -metadata title=... or stuff like that [19:44] <burek> oh.. :) [19:45] <saste> burek: indeed the metadata demuxer/muxer is not documented, only the supported format [19:45] <saste> i suppose you need to use the demuxer for extracting metadata, then use the muxer for writing to a file, using ffmpeg -codec copy -acodec copy [19:45] <saste> never done that so i can only guess [19:46] <burek> -f metadata is invalid, or I'm using an old ffmpeg? [19:46] <saste> what about -f ffmetadata? [19:46] <burek> :beer: :) [19:47] <ubitux> ah nice thing [19:47] <burek> in the docs, there is "metadata", so I tried that first :) [19:48] <saste> ubitux: for *reading* from JSON you need a parser, writing that in ffmpeg would be a bit annoying (same for xml) [19:48] <saste> unless you rely on external libs, and bloat dependencies [19:48] <ubitux> it was just an insane suggestion [19:48] <ubitux> don't take it too seriously ;) [19:49] <burek> hm, I tried ffmpeg -i ... -f ffmetadata out.txt [19:49] <burek> but it just outputs ;FFMETADATA1 line [19:49] <burek> is this a placeholder for future mux/demux or it is a working one? [19:51] <CIA-17> ffmpeg: 03Clément BSsch 07master * re40981b8c4 10ffmpeg/libavformat/microdvddec.c: lavf/microdvd: set packet duration. [19:51] <CIA-17> ffmpeg: 03Clément BSsch 07master * r423b827668 10ffmpeg/ (6 files in 3 dirs): [19:51] <CIA-17> ffmpeg: lavc: add MicroDVD decoder. [19:51] <CIA-17> ffmpeg: Based on my MicroDVD->ASS conversion code from MPlayer [19:51] <CIA-17> ffmpeg: (sub/subassconvert.c). [19:52] <saste> burek: works here, are you sure you *have* metadata in the file? [19:52] <saste> also from what i see the demuxer only extracts metadata in the format, not in the streams [19:52] <burek> oh I see, this one is in the stream, you're right [19:53] <burek> it's ogg audio file, and the vorbis audio contains meta [19:53] <saste> ah... so it's more complicated [19:54] <burek> well, this is also something useful :) [19:54] <burek> at least for some meta I don't have to manually do copy/paste :) [19:56] <saste> how do you set metadata to a specific stream? [19:56] <saste> i suppose ffmpeg can do that, but i don't know how [19:57] <saste> then you can always parse the ffprobe output and insert metadata to the right place, via scripts [19:57] <burek> I tried -map_metadata [19:58] <saste> yep, that's even better [20:00] <burek> oh now I get it, first the output is specified and then input :) [21:40] <CIA-17> ffmpeg: 03Stefano Sabatini 07master * r6f3b1d7f86 10ffmpeg/libavfilter/vf_bbox.c: lavfi/bbox: add missing space between pts and x1 values in the log [21:40] <CIA-17> ffmpeg: 03Stefano Sabatini 07master * r6b55aab01a 10ffmpeg/libavfilter/ (5 files): [21:40] <CIA-17> ffmpeg: lavfi: create buffer reference in filters which need to access the ref later [21:40] <CIA-17> ffmpeg: Also add internal function ff_null_start_frame_keep_ref(). [21:40] <CIA-17> ffmpeg: Fix crash when a following filter (e.g. settb) will unref the reference [21:40] <CIA-17> ffmpeg: passed by start_frame(), and then the reference is accessed in [21:40] <CIA-17> ffmpeg: end_frame() through inlink->cur_buf. [21:58] <Compn> anyone remember the current status of the 3ivx decoder ? [21:58] <Compn> er 3iv1 [21:58] <Compn> last i remember it was disabled because it slowed down decoding of mpeg4 ? [21:59] <Compn> i'm wondering if i should make it into a small ffmpeg task [22:00] <Compn> michaelni : what should be done? split it out as a seperate file ? [22:00] <Compn> mpeg4video.h:#if 0 //3IV1 is quite rare and it slows things down a tiny bit [22:06] <michaelni> if the code still works when enabled then it could somehow be optimized by using always_inline [22:31] <CIA-17> ffmpeg: 03Matthieu Bouron 07master * r73c1e3baad 10ffmpeg/libavfilter/asrc_abuffer.c: [22:31] <CIA-17> ffmpeg: asrc_abuffer: return EAGAIN if no frame is available [22:31] <CIA-17> ffmpeg: Signed-off-by: Michael Niedermayer <michaelni@gmx.at> [22:47] <CIA-17> ffmpeg: 03Stefano Sabatini 07master * ra853e88af2 10ffmpeg/libavfilter/vf_tinterlace.c: lavfi/tinterlace: fix doxy in copy_picture_field() [22:47] <CIA-17> ffmpeg: 03Stefano Sabatini 07master * rcf9f7e40cc 10ffmpeg/libavfilter/vf_tinterlace.c: lavfi/tinterlace: use avfilter_unref_bufferp() [22:47] <CIA-17> ffmpeg: 03Stefano Sabatini 07master * r18c6bd098b 10ffmpeg/libavfilter/vf_tinterlace.c: lavfi/tinterlace: remove unnecessary NULL check in start_frame() [22:57] <ubitux> awesome downsampler: wget http://www.ioccc.org/2011/2011.tar.bz2 && tar xf 2011.tar.bz2 && cd 2011/akari && make [22:57] <ubitux> then ./akari example.ppm > out.ppm [22:58] <ubitux> or even ./akari akari.c > akari2.c [23:00] <Compn> michaelni : well i added 3iv1 decoder as a task to http://wiki.multimedia.cx/index.php?title=Small_FFmpeg_Tasks [23:00] <Compn> maybe someone will pick it up [23:00] <ubitux> holy shit we can build akari2.c [23:01] Action: Compn wonders why libav hasnt removed it so far :P [23:02] <CIA-17> ffmpeg: 03Diego Biurrun 07master * r1b4f085772 10ffmpeg/.gitignore: [23:02] <CIA-17> ffmpeg: gitignore: replace library catch-all pattern by more specific patterns [23:02] <CIA-17> ffmpeg: Ignoring all files that start with the name of a library matches some [23:02] <CIA-17> ffmpeg: files that are not generated. So replace libfoo/libfoo* with patterns [23:02] <CIA-17> ffmpeg: for static and shared libraries, pkg-config and version files. [23:02] <CIA-17> ffmpeg: 03Martin Storsjö 07master * rdf8aa4598c 10ffmpeg/libavformat/mpegts.c: [23:02] <CIA-17> ffmpeg: mpegts: Make sure we don't return uninitialized packets [23:02] <CIA-17> ffmpeg: This fixes crashes, where the demuxer could return 0 even [23:02] <CIA-17> ffmpeg: if the returned AVPacket isn't initialized at all. This [23:02] <CIA-17> ffmpeg: could happen if running into EOF or running out of probesize [23:02] <CIA-17> ffmpeg: with non-seekable sources. [23:02] <CIA-17> ffmpeg: Signed-off-by: Martin Storsjö <martin@martin.st> [23:03] <CIA-17> ffmpeg: 03Michael Niedermayer 07master * r28c5775183 10ffmpeg/: (log message trimmed) [23:03] <CIA-17> ffmpeg: Merge remote-tracking branch 'qatar/master' [23:03] <CIA-17> ffmpeg: * qatar/master: [23:03] <CIA-17> ffmpeg: mpegts: Make sure we don't return uninitialized packets [23:03] <CIA-17> ffmpeg: gitignore: replace library catch-all pattern by more specific patterns [23:03] <CIA-17> ffmpeg: Conflicts: [23:03] <CIA-17> ffmpeg: .gitignore [00:00] --- Sat Apr 28 2012