December 2013 - ffmpeg-cvslog

avcodec/ff_init_vlc_sparse: use a spinlock for thread sync
by git＠videolan.org 17 Jun '14

17 Jun '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jul 13 13:32:39 2013 +0200| [6af8326354ed6c1c68b53b3f2bba6697fb2d3bff] | committer: Michael Niedermayer avcodec/ff_init_vlc_sparse: use a spinlock for thread sync Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6af8326354ed6c1c6… --- libavcodec/bitstream.c | 28 +++++++++++++++++++--------- libavcodec/get_bits.h | 1 + 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 3c4d176..aac32a5 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -28,6 +28,7 @@ * bitstream api. */ +#include "libavutil/atomic.h" #include "libavutil/avassert.h" #include "avcodec.h" #include "mathops.h" @@ -269,14 +270,17 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, { VLCcode *buf; int i, j, ret; + void *state; vlc->bits = nb_bits; if (flags & INIT_VLC_USE_NEW_STATIC) { - if (vlc->table_size && vlc->table_size == vlc->table_allocated) { - return 0; - } else if(vlc->table_size) { - abort(); // fatal error, we are called on a partially initialized table + while (state = avpriv_atomic_ptr_cas(&vlc->init_state, NULL, vlc)) { + if (state == vlc + 1) { + av_assert0(vlc->table_size && vlc->table_size == vlc->table_allocated); + return 0; + } } + av_assert0(!vlc->table_size); } else { vlc->table = NULL; vlc->table_allocated = 0; @@ -326,12 +330,18 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, ret = build_table(vlc, nb_bits, nb_codes, buf, flags); av_free(buf); - if (ret < 0) { - av_freep(&vlc->table); - return ret; + if (flags & INIT_VLC_USE_NEW_STATIC) { + if(vlc->table_size != vlc->table_allocated) + av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); + state = avpriv_atomic_ptr_cas(&vlc->init_state, vlc, vlc+1); + av_assert0(state == vlc); + av_assert0(ret >= 0); + } else { + if (ret < 0) { + av_freep(&vlc->table); + return ret; + } } - if((flags & INIT_VLC_USE_NEW_STATIC) && vlc->table_size != vlc->table_allocated) - av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); return 0; } diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index b6cc75a..3967b49 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -64,6 +64,7 @@ typedef struct VLC { int bits; VLC_TYPE (*table)[2]; ///< code, bits int table_size, table_allocated; + void *init_state; } VLC; typedef struct RL_VLC_ELEM {

4 5

avcodec/hevc: clear HEVClc when its deallocated in hevc_decode_free()
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Dec 31 15:18:47 2013 +0100| [21a2fb7e0579703fdea96f659498ef8b1f243289] | committer: Michael Niedermayer avcodec/hevc: clear HEVClc when its deallocated in hevc_decode_free() Fixes reading freed memory Fixes: asan_heap-uaf_1abf8ef_3987_NUT_A_ericsson_4.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21a2fb7e0579703fd… --- libavcodec/hevc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 55328b3..2f33d1d 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2728,6 +2728,8 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) av_freep(&s->sList[i]); } } + if (s->HEVClc == s->HEVClcList[0]) + s->HEVClc = NULL; av_freep(&s->HEVClcList[0]); for (i = 0; i < s->nals_allocated; i++)

1 0

avformat/version: bump micro for addition of internal field to AVStream
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Dec 31 14:16:27 2013 +0100| [97fca5492a18d0bcd6e7f30834bb926fdbac675e] | committer: Michael Niedermayer avformat/version: bump micro for addition of internal field to AVStream Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97fca5492a18d0bcd… --- libavformat/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/version.h b/libavformat/version.h index fd399ae..2b110d4 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 22 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

avformat: dont run update_initial_duration() twice
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Dec 31 08:36:14 2013 +0100| [4bfcedb33f7bb8aff43a32f924742ed5a4ba3edf] | committer: Michael Niedermayer avformat: dont run update_initial_duration() twice This should avoid floods of first_dts not matching debug messages Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bfcedb33f7bb8aff… --- libavformat/avformat.h | 4 ++++ libavformat/utils.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 52eef0d..6d719d7 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -893,6 +893,10 @@ typedef struct AVStream { */ int pts_wrap_behavior; + /** + * Internal data to prevent doing update_initial_durations() twice + */ + int update_initial_durations_done; } AVStream; AVRational av_stream_get_r_frame_rate(const AVStream *s); diff --git a/libavformat/utils.c b/libavformat/utils.c index 40d886f..b0cb427 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -998,6 +998,9 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, int64_t cur_dts= RELATIVE_TS_BASE; if(st->first_dts != AV_NOPTS_VALUE){ + if (st->update_initial_durations_done) + return; + st->update_initial_durations_done = 1; cur_dts= st->first_dts; for(; pktl; pktl= get_next_pkt(s, st, pktl)){ if(pktl->pkt.stream_index == stream_index){

1 0

Avoid using empty macro arguments.
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Mon Dec 30 12:10:35 2013 +0100| [cbeaf678889baeaac0776305f3ca289318a1aca7] | committer: Reimar Döffinger Avoid using empty macro arguments. These are not supported by all compilers (gcc 2.95 but also older SPARC compilers, see gcc bug #33304 for example), and there is no real need for them. One use of this feature remains in libavdevice/v4l2.c which can't be replaced quite as easily. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbeaf678889baeaac… --- libavcodec/mss1.c | 4 ++-- libavcodec/mss12.h | 14 +++++++------- libavcodec/mss2.c | 4 ++-- libswresample/x86/swresample_x86.c | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index fc88eb0..6bb524b 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -60,7 +60,7 @@ static void arith_normalise(ArithCoder *c) } } -ARITH_GET_BIT() +ARITH_GET_BIT(arith) static int arith_get_bits(ArithCoder *c, int bits) { @@ -105,7 +105,7 @@ static int arith_get_prob(ArithCoder *c, int16_t *probs) return sym; } -ARITH_GET_MODEL_SYM() +ARITH_GET_MODEL_SYM(arith) static void arith_init(ArithCoder *c, GetBitContext *gb) { diff --git a/libavcodec/mss12.h b/libavcodec/mss12.h index a3f9a7c..f953167 100644 --- a/libavcodec/mss12.h +++ b/libavcodec/mss12.h @@ -99,8 +99,8 @@ int ff_mss12_decode_init(MSS12Context *c, int version, SliceContext *sc1, SliceContext *sc2); int ff_mss12_decode_end(MSS12Context *ctx); -#define ARITH_GET_BIT(VERSION) \ -static int arith ## VERSION ## _get_bit(ArithCoder *c) \ +#define ARITH_GET_BIT(prefix) \ +static int prefix ## _get_bit(ArithCoder *c) \ { \ int range = c->high - c->low + 1; \ int bit = 2 * c->value - c->low >= c->high; \ @@ -110,22 +110,22 @@ static int arith ## VERSION ## _get_bit(ArithCoder *c) \ else \ c->high = c->low + (range >> 1) - 1; \ \ - arith ## VERSION ## _normalise(c); \ + prefix ## _normalise(c); \ \ return bit; \ } -#define ARITH_GET_MODEL_SYM(VERSION) \ -static int arith ## VERSION ## _get_model_sym(ArithCoder *c, Model *m) \ +#define ARITH_GET_MODEL_SYM(prefix) \ +static int prefix ## _get_model_sym(ArithCoder *c, Model *m) \ { \ int idx, val; \ \ - idx = arith ## VERSION ## _get_prob(c, m->cum_prob); \ + idx = prefix ## _get_prob(c, m->cum_prob); \ \ val = m->idx2sym[idx]; \ ff_mss12_model_update(m, idx); \ \ - arith ## VERSION ## _normalise(c); \ + prefix ## _normalise(c); \ \ return val; \ } diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 99db046..86a6dcb 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -54,7 +54,7 @@ static void arith2_normalise(ArithCoder *c) } } -ARITH_GET_BIT(2) +ARITH_GET_BIT(arith2) /* L. Stuiver and A. Moffat: "Piecewise Integer Mapping for Arithmetic Coding." * In Proc. 8th Data Compression Conference (DCC '98), pp. 3-12, Mar. 1998 */ @@ -127,7 +127,7 @@ static int arith2_get_prob(ArithCoder *c, int16_t *probs) return i; } -ARITH_GET_MODEL_SYM(2) +ARITH_GET_MODEL_SYM(arith2) static int arith2_get_consumed_bytes(ArithCoder *c) { diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c index 581dc17..7483ba0 100644 --- a/libswresample/x86/swresample_x86.c +++ b/libswresample/x86/swresample_x86.c @@ -21,14 +21,14 @@ #include "libswresample/swresample_internal.h" #include "libswresample/audioconvert.h" -#define PROTO(pre, in, out, cap) void ff ## pre ## _ ##in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len); +#define PROTO(pre, in, out, cap) void ff ## pre ## in## _to_ ##out## _a_ ##cap(uint8_t **dst, const uint8_t **src, int len); #define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap) #define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap) #define PROTO4(pre) PROTO3(pre, mmx) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) -PROTO4() -PROTO4(_pack_2ch) -PROTO4(_pack_6ch) -PROTO4(_unpack_2ch) +PROTO4(_) +PROTO4(_pack_2ch_) +PROTO4(_pack_6ch_) +PROTO4(_unpack_2ch_) av_cold void swri_audio_convert_init_x86(struct AudioConvert *ac, enum AVSampleFormat out_fmt,

1 0

avformat/id3v2: allow ID3 parsing without AVFormatContext
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Anssi Hannula <anssi.hannula(a)iki.fi> | Mon Dec 30 10:02:59 2013 +0200| [7fdf245ab9cb06b7195b8554e0b56f0835d1a142] | committer: Anssi Hannula avformat/id3v2: allow ID3 parsing without AVFormatContext Add ff_id3v2_read_dict() for parsing without AVFormatContext, but instead with AVIOContext and AVDictionary. AVFormatContext is still used for logging, if available. Chapter parsing is the only non-logging functionality that actually needs AVFormatContext, and AFAICS it should be modified to write the data to ID3v2ExtraMeta first, from where it can be implanted to AVFormatContext by a separate function (like it is done with read_apic() and ff_id3v2_parse_apic()). That is outside the scope of this patch, though. Signed-off-by: Anssi Hannula <anssi.hannula(a)iki.fi> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fdf245ab9cb06b71… --- libavformat/id3v2.c | 106 +++++++++++++++++++++++++++++++-------------------- libavformat/id3v2.h | 16 +++++++- 2 files changed, 79 insertions(+), 43 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 54c85d1..3cd23c6 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -532,6 +532,14 @@ static void read_chapter(AVFormatContext *s, AVIOContext *pb, int len, char *tta int taglen; char tag[5]; + if (!s) { + /* We should probably just put the chapter data to extra_meta here + * and do the AVFormatContext-needing part in a separate + * ff_id3v2_parse_apic()-like function. */ + av_log(NULL, AV_LOG_DEBUG, "No AVFormatContext, skipped ID3 chapter data\n"); + return; + } + if (decode_str(s, pb, 0, &dst, &len) < 0) return; if (len < 16) @@ -650,16 +658,17 @@ static const ID3v2EMFunc *get_extra_meta_func(const char *tag, int isv34) return NULL; } -static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, +static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, + AVFormatContext *s, int len, uint8_t version, uint8_t flags, ID3v2ExtraMeta **extra_meta) { int isv34, unsync; unsigned tlen; char tag[5]; - int64_t next, end = avio_tell(s->pb) + len; + int64_t next, end = avio_tell(pb) + len; int taghdrlen; const char *reason = NULL; - AVIOContext pb; + AVIOContext pb_local; AVIOContext *pbx; unsigned char *buffer = NULL; int buffer_size = 0; @@ -693,7 +702,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, unsync = flags & 0x80; if (isv34 && flags & 0x40) { /* Extended header present, just skip over it */ - int extlen = get_size(s->pb, 4); + int extlen = get_size(pb, 4); if (version == 4) /* In v2.4 the length includes the length field we just read. */ extlen -= 4; @@ -702,7 +711,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, reason = "invalid extended header length"; goto error; } - avio_skip(s->pb, extlen); + avio_skip(pb, extlen); len -= extlen + 4; if (len < 0) { reason = "extended header too long."; @@ -718,20 +727,20 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, unsigned long dlen; if (isv34) { - if (avio_read(s->pb, tag, 4) < 4) + if (avio_read(pb, tag, 4) < 4) break; tag[4] = 0; if (version == 3) { - tlen = avio_rb32(s->pb); + tlen = avio_rb32(pb); } else - tlen = get_size(s->pb, 4); - tflags = avio_rb16(s->pb); + tlen = get_size(pb, 4); + tflags = avio_rb16(pb); tunsync = tflags & ID3v2_FLAG_UNSYNCH; } else { - if (avio_read(s->pb, tag, 3) < 3) + if (avio_read(pb, tag, 3) < 3) break; tag[3] = 0; - tlen = avio_rb24(s->pb); + tlen = avio_rb24(pb); } if (tlen > (1<<28)) break; @@ -740,7 +749,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, if (len < 0) break; - next = avio_tell(s->pb) + tlen; + next = avio_tell(pb) + tlen; if (!tlen) { if (tag[0]) @@ -752,7 +761,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, if (tflags & ID3v2_FLAG_DATALEN) { if (tlen < 4) break; - dlen = avio_rb32(s->pb); + dlen = avio_rb32(pb); tlen -= 4; } else dlen = tlen; @@ -771,12 +780,12 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, type = "encrypted and compressed"; av_log(s, AV_LOG_WARNING, "Skipping %s ID3v2 frame %s.\n", type, tag); - avio_skip(s->pb, tlen); + avio_skip(pb, tlen); /* check for text tag or supported special meta tag */ } else if (tag[0] == 'T' || (extra_meta && (extra_func = get_extra_meta_func(tag, isv34)))) { - pbx = s->pb; + pbx = pb; if (unsync || tunsync || tcomp) { av_fast_malloc(&buffer, &buffer_size, tlen); @@ -786,23 +795,23 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, } } if (unsync || tunsync) { - int64_t end = avio_tell(s->pb) + tlen; + int64_t end = avio_tell(pb) + tlen; uint8_t *b; b = buffer; - while (avio_tell(s->pb) < end && b - buffer < tlen && !s->pb->eof_reached) { - *b++ = avio_r8(s->pb); - if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1 && + while (avio_tell(pb) < end && b - buffer < tlen && !pb->eof_reached) { + *b++ = avio_r8(pb); + if (*(b - 1) == 0xff && avio_tell(pb) < end - 1 && b - buffer < tlen && - !s->pb->eof_reached ) { - uint8_t val = avio_r8(s->pb); - *b++ = val ? val : avio_r8(s->pb); + !pb->eof_reached ) { + uint8_t val = avio_r8(pb); + *b++ = val ? val : avio_r8(pb); } } - ffio_init_context(&pb, buffer, b - buffer, 0, NULL, NULL, NULL, + ffio_init_context(&pb_local, buffer, b - buffer, 0, NULL, NULL, NULL, NULL); tlen = b - buffer; - pbx = &pb; // read from sync buffer + pbx = &pb_local; // read from sync buffer } #if CONFIG_ZLIB @@ -818,7 +827,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, } if (!(unsync || tunsync)) { - err = avio_read(s->pb, buffer, tlen); + err = avio_read(pb, buffer, tlen); if (err < 0) { av_log(s, AV_LOG_ERROR, "Failed to read compressed tag\n"); goto seek; @@ -831,26 +840,26 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, av_log(s, AV_LOG_ERROR, "Failed to uncompress tag: %d\n", err); goto seek; } - ffio_init_context(&pb, uncompressed_buffer, dlen, 0, NULL, NULL, NULL, NULL); + ffio_init_context(&pb_local, uncompressed_buffer, dlen, 0, NULL, NULL, NULL, NULL); tlen = dlen; - pbx = &pb; // read from sync buffer + pbx = &pb_local; // read from sync buffer } #endif if (tag[0] == 'T') /* parse text tag */ - read_ttag(s, pbx, tlen, &s->metadata, tag); + read_ttag(s, pbx, tlen, metadata, tag); else /* parse special meta tag */ extra_func->read(s, pbx, tlen, tag, extra_meta, isv34); } else if (!tag[0]) { if (tag[1]) av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding\n"); - avio_skip(s->pb, tlen); + avio_skip(pb, tlen); break; } /* Skip to end of tag */ seek: - avio_seek(s->pb, next, SEEK_SET); + avio_seek(pb, next, SEEK_SET); } /* Footer preset, always 10 bytes, skip over it */ @@ -861,14 +870,15 @@ error: if (reason) av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason); - avio_seek(s->pb, end, SEEK_SET); + avio_seek(pb, end, SEEK_SET); av_free(buffer); av_free(uncompressed_buffer); return; } -void ff_id3v2_read(AVFormatContext *s, const char *magic, - ID3v2ExtraMeta **extra_meta) +static void id3v2_read_internal(AVIOContext *pb, AVDictionary **metadata, + AVFormatContext *s, const char *magic, + ID3v2ExtraMeta **extra_meta) { int len, ret; uint8_t buf[ID3v2_HEADER_SIZE]; @@ -877,10 +887,10 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic, do { /* save the current offset in case there's nothing to read/skip */ - off = avio_tell(s->pb); - ret = avio_read(s->pb, buf, ID3v2_HEADER_SIZE); + off = avio_tell(pb); + ret = avio_read(pb, buf, ID3v2_HEADER_SIZE); if (ret != ID3v2_HEADER_SIZE) { - avio_seek(s->pb, off, SEEK_SET); + avio_seek(pb, off, SEEK_SET); break; } found_header = ff_id3v2_match(buf, magic); @@ -890,15 +900,27 @@ void ff_id3v2_read(AVFormatContext *s, const char *magic, ((buf[7] & 0x7f) << 14) | ((buf[8] & 0x7f) << 7) | (buf[9] & 0x7f); - id3v2_parse(s, len, buf[3], buf[5], extra_meta); + id3v2_parse(pb, metadata, s, len, buf[3], buf[5], extra_meta); } else { - avio_seek(s->pb, off, SEEK_SET); + avio_seek(pb, off, SEEK_SET); } } while (found_header); - ff_metadata_conv(&s->metadata, NULL, ff_id3v2_34_metadata_conv); - ff_metadata_conv(&s->metadata, NULL, id3v2_2_metadata_conv); - ff_metadata_conv(&s->metadata, NULL, ff_id3v2_4_metadata_conv); - merge_date(&s->metadata); + ff_metadata_conv(metadata, NULL, ff_id3v2_34_metadata_conv); + ff_metadata_conv(metadata, NULL, id3v2_2_metadata_conv); + ff_metadata_conv(metadata, NULL, ff_id3v2_4_metadata_conv); + merge_date(metadata); +} + +void ff_id3v2_read_dict(AVIOContext *pb, AVDictionary **metadata, + const char *magic, ID3v2ExtraMeta **extra_meta) +{ + id3v2_read_internal(pb, metadata, NULL, magic, extra_meta); +} + +void ff_id3v2_read(AVFormatContext *s, const char *magic, + ID3v2ExtraMeta **extra_meta) +{ + id3v2_read_internal(s->pb, &s->metadata, s, magic, extra_meta); } void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta) diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index 58970a1..935e934 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -95,7 +95,21 @@ int ff_id3v2_match(const uint8_t *buf, const char *magic); int ff_id3v2_tag_len(const uint8_t *buf); /** - * Read an ID3v2 tag, including supported extra metadata + * Read an ID3v2 tag into specified dictionary and retrieve supported extra metadata. + * + * Chapters are not currently read by this variant. + * + * @param metadata Parsed metadata is stored here + * @param extra_meta If not NULL, extra metadata is parsed into a list of + * ID3v2ExtraMeta structs and *extra_meta points to the head of the list + */ +void ff_id3v2_read_dict(AVIOContext *pb, AVDictionary **metadata, const char *magic, ID3v2ExtraMeta **extra_meta); + +/** + * Read an ID3v2 tag, including supported extra metadata and chapters. + * + * Data is read from and stored to AVFormatContext. + * * @param extra_meta If not NULL, extra metadata is parsed into a list of * ID3v2ExtraMeta structs and *extra_meta points to the head of the list */

1 0

avformat/http: allow the caller to select a request range
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Anssi Hannula <anssi.hannula(a)iki.fi> | Sat Dec 28 09:41:24 2013 +0200| [d52882faef368264f9fe5a595274ec84d3446132] | committer: Anssi Hannula avformat/http: allow the caller to select a request range Add AVOptions for setting the initial offset and the ending offset, so they can be used for setting an appropriate Range header. Signed-off-by: Anssi Hannula <anssi.hannula(a)iki.fi> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d52882faef368264f… --- libavformat/http.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 0619e2a..fd29966 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -52,7 +52,7 @@ typedef struct { int64_t chunksize; /**< Used if "Transfer-Encoding: chunked" otherwise -1. */ char *content_type; char *user_agent; - int64_t off, filesize; + int64_t off, filesize, req_end_offset; int icy_data_read; ///< how much data was read since last ICY metadata packet int icy_metaint; ///< after how many bytes of read data a new metadata packet will be found char *location; @@ -105,6 +105,8 @@ static const AVOption options[] = { {"basic", "HTTP basic authentication", 0, AV_OPT_TYPE_CONST, {.i64 = HTTP_AUTH_BASIC}, 0, 0, D|E, "auth_type" }, {"send_expect_100", "Force sending an Expect: 100-continue header for POST", OFFSET(send_expect_100), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E }, {"location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E }, +{"offset", "initial byte offset", OFFSET(off), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, D }, +{"end_offset", "try to limit the request to bytes preceding this offset", OFFSET(req_end_offset), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, D }, {NULL} }; #define HTTP_CLASS(flavor)\ @@ -643,9 +645,15 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, // Note: we send this on purpose even when s->off is 0 when we're probing, // since it allows us to detect more reliably if a (non-conforming) // server supports seeking by analysing the reply headers. - if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->seekable == -1)) + if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->req_end_offset || s->seekable == -1)) { len += av_strlcatf(headers + len, sizeof(headers) - len, - "Range: bytes=%"PRId64"-\r\n", s->off); + "Range: bytes=%"PRId64"-", s->off); + if (s->req_end_offset) + len += av_strlcatf(headers + len, sizeof(headers) - len, + "%"PRId64, s->req_end_offset - 1); + len += av_strlcpy(headers + len, "\r\n", + sizeof(headers) - len); + } if (send_expect_100 && !has_header(s->headers, "\r\nExpect: ")) len += av_strlcatf(headers + len, sizeof(headers) - len, "Expect: 100-continue\r\n");

1 0

avformat/id3v2: parse ID3 Private frames as extra metadata
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Anssi Hannula <anssi.hannula(a)iki.fi> | Mon Dec 30 10:09:17 2013 +0200| [53765ae33b8b0baaebd1914b165bb26fb6122176] | committer: Anssi Hannula avformat/id3v2: parse ID3 Private frames as extra metadata They are used in HLS. Signed-off-by: Anssi Hannula <anssi.hannula(a)iki.fi> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53765ae33b8b0baae… --- libavformat/id3v2.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ libavformat/id3v2.h | 6 ++++++ 2 files changed, 52 insertions(+) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 3eb368e..54c85d1 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -570,6 +570,51 @@ end: av_free(dst); } +static void free_priv(void *obj) +{ + ID3v2ExtraMetaPRIV *priv = obj; + av_freep(&priv->owner); + av_freep(&priv->data); + av_freep(&priv); +} + +static void read_priv(AVFormatContext *s, AVIOContext *pb, int taglen, + char *tag, ID3v2ExtraMeta **extra_meta, int isv34) +{ + ID3v2ExtraMeta *meta; + ID3v2ExtraMetaPRIV *priv; + + meta = av_mallocz(sizeof(*meta)); + priv = av_mallocz(sizeof(*priv)); + + if (!meta || !priv) + goto fail; + + if (decode_str(s, pb, ID3v2_ENCODING_ISO8859, &priv->owner, &taglen) < 0) + goto fail; + + priv->data = av_malloc(taglen); + if (!priv->data) + goto fail; + + priv->datasize = taglen; + + if (avio_read(pb, priv->data, priv->datasize) != priv->datasize) + goto fail; + + meta->tag = "PRIV"; + meta->data = priv; + meta->next = *extra_meta; + *extra_meta = meta; + + return; + +fail: + if (priv) + free_priv(priv); + av_freep(&meta); +} + typedef struct ID3v2EMFunc { const char *tag3; const char *tag4; @@ -582,6 +627,7 @@ static const ID3v2EMFunc id3v2_extra_meta_funcs[] = { { "GEO", "GEOB", read_geobtag, free_geobtag }, { "PIC", "APIC", read_apic, free_apic }, { "CHAP","CHAP", read_chapter, NULL }, + { "PRIV","PRIV", read_priv, free_priv }, { NULL } }; diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h index e893922..58970a1 100644 --- a/libavformat/id3v2.h +++ b/libavformat/id3v2.h @@ -73,6 +73,12 @@ typedef struct ID3v2ExtraMetaAPIC { enum AVCodecID id; } ID3v2ExtraMetaAPIC; +typedef struct ID3v2ExtraMetaPRIV { + uint8_t *owner; + uint8_t *data; + uint32_t datasize; +} ID3v2ExtraMetaPRIV; + /** * Detect ID3v2 Header. * @param buf must be ID3v2_HEADER_SIZE byte long

1 0

avformat/mpegts: demux timed ID3 metadata
by git＠videolan.org 31 Dec '13

31 Dec '13

ffmpeg | branch: master | Anssi Hannula <anssi.hannula(a)iki.fi> | Mon Dec 30 09:50:46 2013 +0200| [4a4437c0fbc8f7afe0c533070395a42e56b4ee75] | committer: Anssi Hannula avformat/mpegts: demux timed ID3 metadata Used in some HLS streams ("Timed Metadata for HTTP Live Streaming"). This is just ID3 tags at arbitrary stream positions, but I still added "timed" to the codec name to avoid confusion with regular non-stream ID3 tags. Signed-off-by: Anssi Hannula <anssi.hannula(a)iki.fi> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a4437c0fbc8f7afe… --- libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 6 ++++++ libavformat/mpegts.c | 1 + 3 files changed, 8 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c614829..37f6807 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -513,6 +513,7 @@ enum AVCodecID { AV_CODEC_ID_OTF = MKBETAG( 0 ,'O','T','F'), AV_CODEC_ID_SMPTE_KLV = MKBETAG('K','L','V','A'), AV_CODEC_ID_DVD_NAV = MKBETAG('D','N','A','V'), + AV_CODEC_ID_TIMED_ID3 = MKBETAG('T','I','D','3'), AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index c62734f..1639046 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2622,6 +2622,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "dvd_nav_packet", .long_name = NULL_IF_CONFIG_SMALL("DVD Nav packet"), }, + { + .id = AV_CODEC_ID_TIMED_ID3, + .type = AVMEDIA_TYPE_DATA, + .name = "timed_id3", + .long_name = NULL_IF_CONFIG_SMALL("timed ID3 metadata"), + }, }; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 39b1b5d..db380ca 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -662,6 +662,7 @@ static const StreamType REGD_types[] = { static const StreamType METADATA_types[] = { { MKTAG('K','L','V','A'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_KLV }, + { MKTAG('I','D','3',' '), AVMEDIA_TYPE_DATA, AV_CODEC_ID_TIMED_ID3 }, { 0 }, };

1 0

[ffmpeg-web] branch master updated. b5045de web/projects: remove abandoned homeless projects
by ffmpeg-cvslog＠ffmpeg.org 30 Dec '13

30 Dec '13

The branch, master has been updated via b5045dec5578a34e77657c55d97120c07d9b138f (commit) from 1982975eda671b77f79fd3b1683314d56480e9e2 (commit) - Log ----------------------------------------------------------------- commit b5045dec5578a34e77657c55d97120c07d9b138f Author: Lou Logan <lou(a)lrcd.com> AuthorDate: Sun Dec 29 16:52:15 2013 -0900 Commit: Lou Logan <lou(a)lrcd.com> CommitDate: Mon Dec 30 11:40:58 2013 -0900 web/projects: remove abandoned homeless projects Also update valid redirects/URL changes, and remove excess verbage indicating that list is obviously alphabetical. diff --git a/src/projects b/src/projects index 2579c1d..392e144 100644 --- a/src/projects +++ b/src/projects @@ -8,36 +8,25 @@ an email to the <a href="contact.html">ffmpeg-devel mailing list</a>. <table> <tr> -<td colspan="2" align="center"> -(in alphabetical order) -</td> -</tr> - -<tr> <td> <ul> <li><a href="http://sourceforge.net/projects/ac3encode/">ac3encode</a></li> <li><a href="http://alembik.sourceforge.net/">Alembik</a></li> <li><a href="http://code.google.com/p/amv-codec-tools/">AMV codec tools</a></li> -<li><a href="http://analogwhole.com/">AnalogWhole</a></li> <li><a href="http://atglas.sourceforge.net/">AtGLas</a></li> <li><a href="http://code.google.com/p/avbin/">AVbin</a></li> <li><a href="http://avifile.sourceforge.net/">avifile</a></li> <li><a href="http://gatos.sourceforge.net/avview.php">Avview</a></li> <li><a href="http://www.bebits.com/app/2575">BeOS FFmpeg decoders</a> and <a href="http://www.bebits.com/app/2867">BeOS HybridDivx</a></li> -<li><a href="http://dspguru.doom9.net/">BeSweet</a></li> <li><a href="http://bino3d.org/">Bino</a></li> -<li><a href="http://www.longtailvideo.com/bits-on-the-run/">Bits on the Run</a></li> <li><a href="http://www.independentsounds.de/">Blaze</a></li> <li><a href="http://www.blender.org/">Blender</a></li> -<li><a href="http://chromaplayer.com/">Chroma Player</a></li> <li><a href="http://www.chromium.org/">Chromium</a> / <a href="http://www.google.com/chrome">Google Chrome</a></li> <li><a href="http://sourceforge.net/projects/chronictv/">chronictv</a></li> <li><a href="http://cinelerra.org/">Cinelerra</a></li> <li><a href="http://ccv.nuigroup.com/">Community Core Vision</a></li> -<li><a href="http://www.coreplayer.com/">CorePlayer</a></li> +<li><a href="http://www.corecodec.com/products/coreplayer">CorePlayer</a></li> <li><a href="http://datura.sourceforge.net/">Datura</a></li> -<li><a href="http://www.objectifmac.com/english/downloads.php">D-Volution</a></li> <li><a href="http://sourceforge.net/projects/divxtodvd/">DivXtoDVD</a></li> <li><a href="http://labs.divx.com/DrDivX">Dr. Divx</a></li> <li><a href="http://code.google.com/p/drag2dv/">Drag2DV</a></li> @@ -47,8 +36,8 @@ an email to the <a href="contact.html">ffmpeg-devel mailing list</a>. <li><a href="http://sourceforge.net/projects/easyvob2divx/">Easy VOB 2 DivX</a></li> <li><a href="http://www.easywma.com/">EasyWMA</a> / <a href="http://www.easywma.com/wmv/">EasyWMV</a></li> <li><a href="http://www.electricsheep.org">Electric Sheep</a></li> -<li><a href="http://dcunningham.net/media-tools/encodehd/">EncodeHD</a></li> -<li><a href="http://ffdshow.sourceforge.net/">ffdshow</a></li> +<li><a href="http://dcunningham.net/applications/encodehd/">EncodeHD</a></li> +<li><a href="http://sourceforge.net/projects/ffdshow/">ffdshow</a></li> <li><a href="http://ffdshow-tryout.sourceforge.net/">ffdshow-tryouts</a></li> <li><a href="http://corz.org/windows/software/ffe/">ffe</a></li> <li><a href="http://code.google.com/p/ffmbc/">FFmedia Broadcast</a></li> @@ -60,55 +49,51 @@ an email to the <a href="contact.html">ffmpeg-devel mailing list</a>. <li><a href="http://code.google.com/p/ffmpegthumbnailer/">FFMpegThumbnailer</a></li> <li><a href="http://www.ffmpegx.com/">ffmpegX for Mac OS X</a></li> <li><a href="http://ffmpegyag.sourceforge.net">FFmpegYAG</a></li> -<li><a href="http://colabti.de/convertx/">FFRecord</a></li> +<li><a href="http://colabti.org/convertx/ffrecord.html">FFRecord</a></li> <li><a href="http://www.tagtraum.com/ffsampledsp/">FFSampledSP - Java Sound for Win/OS X</a></li> <li><a href="http://fftv.sourceforge.net/">fftv</a></li> <li><a href="http://aldorandenet.free.fr/codecs/">FFusion, Alternative Codecs for Mac OS X</a></li> <li><a href="http://firefogg.org">Firefogg</a></li> -<li><a href="http://www.khertz.net/flvget/">FLVGET</a></li> <li><a href="http://fmj.sourceforge.net/">FMJ</a></li> <li><a href="http://fobs.sourceforge.net/">Fobs</a></li> <li><a href="http://freej.org/">FreeJ</a></li> <li><a href="http://frogger.rules.pl/">Frogger</a></li> -<li><a href="http://gallery.sourceforge.net/">Gallery</a></li> +<li><a href="http://galleryproject.org/">Gallery</a></li> <li><a href="http://gmerlin.sourceforge.net/">gmerlin</a></li> <li><a href="http://gnashdev.org/">Gnash</a></li> <li><a href="http://gpac.sourceforge.net/">GPAC</a></li> -<li><a href="http://www.gstreamer.net/">GStreamer</a></li> +<li><a href="http://gstreamer.freedesktop.org">GStreamer</a></li> <li><a href="http://handbrake.fr/">HandBrake</a></li> -<li><a href="http://www.lonelycoder.com/hts/">Home Theater System</a></li> <li><a href="http://www.homer-conferencing.com">Homer Conferencing</a></li> <li><a href="http://sourceforge.net/projects/hypervideoconve/">Hyper Video Converter</a></li> -<li><a href="http://imtoo.com/">ImTOO DVD Ripper</a></li> <li><a href="http://www.eingrad.com/products/internet-radio-box/">Internet Radio Box</a></li> <li><a href="http://jffmpeg.sourceforge.net/">Jffmpeg</a></li> +<li><a href="http://www.jwplayer.com/hosting-and-streaming/">JW Platform</a></li> <li><a href="http://www.kdenlive.org/">Kdenlive</a></li> -<li><a href="http://kfilm.sourceforge.net/">KFilm</a></li> <li><a href="http://code.google.com/p/kmediafactory/">KMediaFactory</a></li> <li><a href="http://savannah.nongnu.org/projects/kinetophone">Kinetophone</a></li> -<li><a href="http://ktoon.net/">KToon</a></li> +<li><a href="http://ktoon.net/">KTooN</a></li> <li><a href="http://libdlna.geexbox.org/">libdlna</a></li> <li><a href="http://libquicktime.sourceforge.net/">libquicktime</a></li> -<li><a href="http://lightspark.sourceforge.net/">Lightspark</a></li> -<li><a href="http://www.xs4all.nl/~salsaman/lives/index.html">LIVES</a></li> +<li><a href="http://lightspark.github.io/">Lightspark</a></li> +<li><a href="http://lives.sourceforge.net/">LiVES</a></li> <li><a href="http://lulop2.sourceforge.net/">LULOP2</a></li> <li><a href="http://lumiera.org/">Lumiera</a></li> +<li><a href="http://lynkeos.sourceforge.net/">Lynkeos</a></li> </ul> </td> <td> <ul> -<li><a href="http://lynkeos.sourceforge.net/">Lynkeos</a></li> <li><a href="http://mconverter.sourceforge.net/">mConverter</a></li> <li><a href="http://www.mltframework.org/">MLT Framework</a></li> <li><a href="http://mobilehackerz.jp/contents/3GPConv">MobileHackerz</a></li> -<li><a href="http://www.miksoft.net/mobileMediaConverter.htm">Mobile Media Converter</a></li> +<li><a href="http://www.miksoft.net/mobileMediaConverter.php">Mobile Media Converter</a></li> <li><a href="http://www.mobiletoones.com/">MobileToones</a></li> <li><a href="http://mod2avi.sourceforge.net/">mod2avi</a></li> <li><a href="http://sourceforge.net/projects/modprismiq/">modprismiq</a></li> <li><a href="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome">Motion</a></li> <li><a href="http://moviethumbnail.sourceforge.net/">movie thumbnailer</a></li> -<li><a href="http://www.moviegate.net/">MovieGate</a></li> <li><a href="http://movieconverter.online.fr/">MovieConverter</a></li> <li><a href="http://code.google.com/p/movist/">Movist</a></li> <li><a href="http://sourceforge.net/projects/mpc-hc/">MPC - Homecinema</a></li> @@ -118,13 +103,13 @@ an email to the <a href="contact.html">ffmpeg-devel mailing list</a>. <li><a href="http://www.mythtv.org/">MythTV</a></li> <li><a href="http://nvrec.sourceforge.net/">nvrec</a></li> <li><a href="http://www.2600.com/offthehook/">Off The Hook</a></li> -<li><a href="http://openh323.sourceforge.net/">OpenH323</a></li> -<li><a href="http://www.openlibraries.org/">OpenLibraries</a></li> +<li><a href="http://sourceforge.net/projects/openh323/">OpenH323</a></li> +<li><a href="http://www.jahshaka.com/develop/openlibraries/">OpenLibraries</a></li> <li><a href="http://www.openmovieeditor.org/">Open Movie Editor</a></li> <li><a href="http://openvip.sourceforge.net/">OpenVIP</a></li> <li><a href="http://www.perian.org/">Perian</a></li> <li><a href="http://falun.dafa.is.free.fr/altair/php4ffprobe.php">PHP4FFprobe</a></li> -<li><a href="http://code.google.com/p/phpvideotoolkit/">phpvideotoolkit</a></li> +<li><a href="https://github.com/buggedcom/phpvideotoolkit-v2">phpvideotoolkit</a></li> <li><a href="http://pspvc.sourceforge.net/">PlayStation Portable Video Converter</a></li> <li><a href="http://www.cyberlink.com/stat/support/enu/open-source-info/index.jsp">PowerCinema for Linux</a></li> <li><a href="http://www.pspvideo9.com/">PSP Video 9</a></li> @@ -141,23 +126,20 @@ an email to the <a href="contact.html">ffmpeg-devel mailing list</a>. <li><a href="http://www.rockbox.org">Rockbox</a></li> <li><a href="http://shotdetect.nonutc.fr/">shotdetect</a></li> <li><a href="http://sourceforge.net/projects/screenkast/">SkreenKast</a></li> -<li><a href="http://www.spek-project.org">Spek - Acoustic Spectrum Analyser</a></li> +<li><a href="http://spek.cc/">Spek - Acoustic Spectrum Analyser</a></li> <li><a href="http://stepmania.com/">StepMania</a></li> <li><a href="http://markolson.github.io/storyboard/">Storyboard</a></li> -<li><a href="http://streamstudio.sourceforge.net/">StreamStudio</a></li> <li><a href="http://www.erightsoft.net/SUPER.html">SUPER</a></li> <li><a href="http://git.mansr.com/?p=tcvp">TCVP</a></li> -<li><a href="http://thinliquidfilm.org/">thin liquid film</a></li> -<li><a href="http://www.thekompany.com/embedded/tkcvideo/">tkcVideo</a></li> <li><a href="http://www.transcoding.org/">Transcode</a></li> <li><a href="http://sourceforge.net/projects/tubecaster/">Tubecaster</a></li> <li><a href="http://tversity.com/">TVersity</a></li> <li><a href="http://vchannel.sourceforge.net/player.html">V-Player</a></li> <li><a href="http://vdownloader.com/">VDownloader</a></li> <li><a href="http://softdevice.berlios.de/">vdr-softdevice</a></li> -<li><a href="http://veejay.sourceforge.net/">VeeJay</a></li> +<li><a href="http://www.veejayhq.net/">VeeJay</a></li> <li><a href="http://www.viceteam.org/">VICE</a></li> -<li><a href="http://laurent.ettouati.free.fr/english/">VideoSpec</a></li> +<li><a href="http://videospec.free.fr/english/">VideoSpec</a></li> <li><a href="http://virchor.sourceforge.net/">Virtual Choreographer</a></li> <li><a href="http://vitooki.sourceforge.net/">ViTooKi</a></li> <li><a href="http://vive.sourceforge.net/">Vive</a></li> @@ -172,8 +154,7 @@ an email to the <a href="contact.html">ffmpeg-devel mailing list</a>. <li><a href="http://sourceforge.net/projects/xmffmpeg/">XMFFMPEG</a></li> <li><a href="http://www.xuggle.com/xuggler/">Xuggler</a></li> <li><a href="http://xvidcap.sourceforge.net/">xvidcap</a></li> -<li><a href="http://sourceforge.net/projects/xbyamp">YAMP</a></li> -<li><a href="http://yellowtab.com/">Zeta</a></li> +<li><a href="http://sourceforge.net/projects/xbyamp/">YAMP</a></li> <li><a href="http://www.zoneminder.com/">ZoneMinder</a></li> </ul> </td> ----------------------------------------------------------------------- Summary of changes: src/projects | 57 +++++++++++++++++++-------------------------------------- 1 files changed, 19 insertions(+), 38 deletions(-) hooks/post-receive --

1 0