From 488d2b6349e3c07fec73c28a165f8d292b413362 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 19 Apr 2011 21:16:35 +0200 Subject: [PATCH 01/14] lavu: remove disabled sha1 cruft. --- libavutil/Makefile | 1 - libavutil/sha.c | 24 ------------------- libavutil/sha1.h | 57 ---------------------------------------------- 3 files changed, 82 deletions(-) delete mode 100644 libavutil/sha1.h diff --git a/libavutil/Makefile b/libavutil/Makefile index baee496e7c..8c3cc60dab 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -35,7 +35,6 @@ HEADERS = adler32.h \ rational.h \ samplefmt.h \ sha.h \ - sha1.h \ BUILT_HEADERS = avconfig.h diff --git a/libavutil/sha.c b/libavutil/sha.c index 6d9c84ecfa..ae6069dd34 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -25,7 +25,6 @@ #include "avutil.h" #include "bswap.h" #include "sha.h" -#include "sha1.h" #include "intreadwrite.h" /** hash context */ @@ -324,29 +323,6 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest) AV_WB32(digest + i*4, ctx->state[i]); } -#if LIBAVUTIL_VERSION_MAJOR < 51 -struct AVSHA1 { - AVSHA sha; -}; - -const int av_sha1_size = sizeof(struct AVSHA1); - -void av_sha1_init(struct AVSHA1* context) -{ - av_sha_init(&context->sha, 160); -} - -void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len) -{ - av_sha_update(&context->sha, data, len); -} - -void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]) -{ - av_sha_final(&context->sha, digest); -} -#endif - #ifdef TEST #include #undef printf diff --git a/libavutil/sha1.h b/libavutil/sha1.h deleted file mode 100644 index b60d7704c0..0000000000 --- a/libavutil/sha1.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2007 Michael Niedermayer - * - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Libav is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_SHA1_H -#define AVUTIL_SHA1_H - -#include - -extern const int av_sha1_size; - -struct AVSHA1; - -/** - * Initialize SHA-1 hashing. - * - * @param context pointer to the function context (of size av_sha_size) - * @deprecated use av_sha_init() instead - */ -void av_sha1_init(struct AVSHA1* context); - -/** - * Update hash value. - * - * @param context hash function context - * @param data input data to update hash with - * @param len input data length - * @deprecated use av_sha_update() instead - */ -void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len); - -/** - * Finish hashing and output digest value. - * - * @param context hash function context - * @param digest buffer where output digest value is stored - * @deprecated use av_sha_final() instead - */ -void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]); - -#endif /* AVUTIL_SHA1_H */ From 975c27340528b9e053a7ae9b63b764984e91941c Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 19 Apr 2011 21:21:44 +0200 Subject: [PATCH 02/14] lavu: remove disabled ff_random_get_seed cruft. --- libavutil/random_seed.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavutil/random_seed.c b/libavutil/random_seed.c index 6dc8d22ca4..a1078d8bbb 100644 --- a/libavutil/random_seed.c +++ b/libavutil/random_seed.c @@ -80,11 +80,3 @@ uint32_t av_get_random_seed(void) return seed; return get_generic_seed(); } - -#if LIBAVUTIL_VERSION_MAJOR < 51 -attribute_deprecated uint32_t ff_random_get_seed(void); -uint32_t ff_random_get_seed(void) -{ - return av_get_random_seed(); -} -#endif From 7dfe244fbd9a3c0a24cac441a4ec777da8f3a666 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 19 Apr 2011 21:25:10 +0200 Subject: [PATCH 03/14] sws: remove disabled cruft. --- libswscale/rgb2rgb.c | 28 ---------------------------- libswscale/rgb2rgb.h | 10 ---------- libswscale/swscale.c | 8 -------- libswscale/swscale.h | 16 ---------------- libswscale/utils.c | 7 ------- 5 files changed, 69 deletions(-) diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 12d6287a4b..74cc42e3b0 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -124,34 +124,6 @@ void sws_rgb2rgb_init(int flags) #endif /* HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX */ } -#if LIBSWSCALE_VERSION_MAJOR < 1 -void palette8topacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) -{ - sws_convertPalette8ToPacked32(src, dst, num_pixels, palette); -} - -void palette8topacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) -{ - sws_convertPalette8ToPacked24(src, dst, num_pixels, palette); -} - -/** - * Palette is assumed to contain BGR16, see rgb32to16 to convert the palette. - */ -void palette8torgb16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette) -{ - long i; - for (i=0; i Date: Tue, 19 Apr 2011 19:48:44 +0200 Subject: [PATCH 04/14] Reflect 0.7_beta1 release in the Changelog --- Changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Changelog b/Changelog index 4bc6d31d36..f38ef9eec5 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,11 @@ releases are sorted from youngest to oldest. version : +- Lots of deprecated API cruft removed + + +version 0.7_beta1: + - WebM support in Matroska de/muxer - low overhead Ogg muxing - MMS-TCP support From a81ff195c15ccfa34f25b7b753c2e5438fe8939e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 19 Apr 2011 21:53:48 +0200 Subject: [PATCH 05/14] libpostproc: Remove crufty code disabled by the big bump. --- libpostproc/postprocess.c | 4 ---- libpostproc/postprocess.h | 6 ------ 2 files changed, 10 deletions(-) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 73ffcb4a63..d7c99e29da 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -695,11 +695,7 @@ static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[] /* -pp Command line Help */ -#if LIBPOSTPROC_VERSION_INT < (52<<16) -const char *const pp_help= -#else const char pp_help[] = -#endif "Available postprocessing filters:\n" "Filters Options\n" "short long name short long option Description\n" diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index 9e74589455..fe8c9b96ce 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -67,13 +67,7 @@ const char *postproc_license(void); typedef void pp_context; typedef void pp_mode; -#if LIBPOSTPROC_VERSION_INT < (52<<16) -typedef pp_context pp_context_t; -typedef pp_mode pp_mode_t; -extern const char *const pp_help; ///< a simple help text -#else extern const char pp_help[]; ///< a simple help text -#endif void pp_postprocess(const uint8_t * src[3], const int srcStride[3], uint8_t * dst[3], const int dstStride[3], From 8408e1d7d69aad57e633c27a6bcd522a15fa3702 Mon Sep 17 00:00:00 2001 From: Vladimir Pantelic Date: Wed, 20 Apr 2011 12:31:10 +0200 Subject: [PATCH 06/14] asf: remove commented out code in asf_read_seek Signed-off-by: Mans Rullgard --- libavformat/asfdec.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 8dc5291ff1..8e10d68b62 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -1270,27 +1270,6 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int /* find the position */ pos = st->index_entries[index].pos; - // various attempts to find key frame have failed so far - // asf_reset_header(s); - // avio_seek(s->pb, pos, SEEK_SET); - // key_pos = pos; - // for(i=0;i<16;i++){ - // pos = avio_tell(s->pb); - // if (av_read_frame(s, &pkt) < 0){ - // av_log(s, AV_LOG_INFO, "seek failed\n"); - // return -1; - // } - // asf_st = s->streams[stream_index]->priv_data; - // pos += st->parser->frame_offset; - // - // if (pkt.size > b) { - // b = pkt.size; - // key_pos = pos; - // } - // - // av_free_packet(&pkt); - // } - /* do the seek */ av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos); avio_seek(s->pb, pos, SEEK_SET); From c60112f26873afafb55d24cc50a0e93ad9411373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 20 Apr 2011 11:40:29 +0200 Subject: [PATCH 07/14] libavformat: Make protocols pass URLContext as log context where available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the libavformat major bump, URLContext contains an AVClass, making it a usable log context. Signed-off-by: Martin Storsjö --- libavformat/applehttpproto.c | 10 +++++----- libavformat/gopher.c | 2 +- libavformat/http.c | 4 ++-- libavformat/tcp.c | 4 ++-- libavformat/udp.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavformat/applehttpproto.c b/libavformat/applehttpproto.c index 8a9bcb1ade..37b289a1e0 100644 --- a/libavformat/applehttpproto.c +++ b/libavformat/applehttpproto.c @@ -195,7 +195,7 @@ static int applehttp_open(URLContext *h, const char *uri, int flags) av_strlcpy(s->playlisturl, "http://", sizeof(s->playlisturl)); av_strlcat(s->playlisturl, nested_url, sizeof(s->playlisturl)); } else { - av_log(NULL, AV_LOG_ERROR, "Unsupported url %s\n", uri); + av_log(h, AV_LOG_ERROR, "Unsupported url %s\n", uri); ret = AVERROR(EINVAL); goto fail; } @@ -218,7 +218,7 @@ static int applehttp_open(URLContext *h, const char *uri, int flags) } if (s->n_segments == 0) { - av_log(NULL, AV_LOG_WARNING, "Empty playlist\n"); + av_log(h, AV_LOG_WARNING, "Empty playlist\n"); ret = AVERROR(EIO); goto fail; } @@ -258,7 +258,7 @@ retry: return ret; } if (s->cur_seq_no < s->start_seq_no) { - av_log(NULL, AV_LOG_WARNING, + av_log(h, AV_LOG_WARNING, "skipping %d segments ahead, expired from playlist\n", s->start_seq_no - s->cur_seq_no); s->cur_seq_no = s->start_seq_no; @@ -274,12 +274,12 @@ retry: goto retry; } url = s->segments[s->cur_seq_no - s->start_seq_no]->url, - av_log(NULL, AV_LOG_DEBUG, "opening %s\n", url); + av_log(h, AV_LOG_DEBUG, "opening %s\n", url); ret = ffurl_open(&s->seg_hd, url, AVIO_FLAG_READ); if (ret < 0) { if (url_interrupt_cb()) return AVERROR_EXIT; - av_log(NULL, AV_LOG_WARNING, "Unable to open %s\n", url); + av_log(h, AV_LOG_WARNING, "Unable to open %s\n", url); s->cur_seq_no++; goto retry; } diff --git a/libavformat/gopher.c b/libavformat/gopher.c index 1d38cd232f..79d1feba6b 100644 --- a/libavformat/gopher.c +++ b/libavformat/gopher.c @@ -50,7 +50,7 @@ static int gopher_connect(URLContext *h, const char *path) if (!path) return AVERROR(EINVAL); break; default: - av_log(NULL, AV_LOG_WARNING, + av_log(h, AV_LOG_WARNING, "Gopher protocol type '%c' not supported yet!\n", *path); return AVERROR(EINVAL); diff --git a/libavformat/http.c b/libavformat/http.c index 190f844ea1..7d59152409 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -70,7 +70,7 @@ void ff_http_set_headers(URLContext *h, const char *headers) int len = strlen(headers); if (len && strcmp("\r\n", headers + len - 2)) - av_log(NULL, AV_LOG_ERROR, "No trailing CRLF found in HTTP header.\n"); + av_log(h, AV_LOG_ERROR, "No trailing CRLF found in HTTP header.\n"); av_strlcpy(s->headers, headers, sizeof(s->headers)); } @@ -232,7 +232,7 @@ static int process_line(URLContext *h, char *line, int line_count, * don't abort until all headers have been parsed. */ if (s->http_code >= 400 && s->http_code < 600 && s->http_code != 401) { end += strspn(end, SPACE_CHARS); - av_log(NULL, AV_LOG_WARNING, "HTTP error %d %s\n", + av_log(h, AV_LOG_WARNING, "HTTP error %d %s\n", s->http_code, end); return -1; } diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 0cb3ae3262..ced103876f 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -64,7 +64,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags) snprintf(portstr, sizeof(portstr), "%d", port); ret = getaddrinfo(hostname, portstr, &hints, &ai); if (ret) { - av_log(NULL, AV_LOG_ERROR, + av_log(h, AV_LOG_ERROR, "Failed to resolve hostname %s: %s\n", hostname, gai_strerror(ret)); return AVERROR(EIO); @@ -119,7 +119,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags) optlen = sizeof(ret); getsockopt (fd, SOL_SOCKET, SO_ERROR, &ret, &optlen); if (ret != 0) { - av_log(NULL, AV_LOG_ERROR, + av_log(h, AV_LOG_ERROR, "TCP connection to %s:%d failed: %s\n", hostname, port, strerror(ret)); goto fail; diff --git a/libavformat/udp.c b/libavformat/udp.c index 76e3f1a4a2..932eb19c2d 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -266,7 +266,7 @@ int ff_udp_set_remote_url(URLContext *h, const char *uri) if (connect(s->udp_fd, (struct sockaddr *) &s->dest_addr, s->dest_addr_len)) { s->is_connected = 0; - av_log(NULL, AV_LOG_ERROR, "connect: %s\n", strerror(errno)); + av_log(h, AV_LOG_ERROR, "connect: %s\n", strerror(errno)); return AVERROR(EIO); } } @@ -410,7 +410,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) /* limit the tx buf size to limit latency */ tmp = s->buffer_size; if (setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp)) < 0) { - av_log(NULL, AV_LOG_ERROR, "setsockopt(SO_SNDBUF): %s\n", strerror(errno)); + av_log(h, AV_LOG_ERROR, "setsockopt(SO_SNDBUF): %s\n", strerror(errno)); goto fail; } } else { @@ -418,14 +418,14 @@ static int udp_open(URLContext *h, const char *uri, int flags) * avoid losing data on OSes that set this too low by default. */ tmp = s->buffer_size; if (setsockopt(udp_fd, SOL_SOCKET, SO_RCVBUF, &tmp, sizeof(tmp)) < 0) { - av_log(NULL, AV_LOG_WARNING, "setsockopt(SO_RECVBUF): %s\n", strerror(errno)); + av_log(h, AV_LOG_WARNING, "setsockopt(SO_RECVBUF): %s\n", strerror(errno)); } /* make the socket non-blocking */ ff_socket_nonblock(udp_fd, 1); } if (s->is_connected) { if (connect(udp_fd, (struct sockaddr *) &s->dest_addr, s->dest_addr_len)) { - av_log(NULL, AV_LOG_ERROR, "connect: %s\n", strerror(errno)); + av_log(h, AV_LOG_ERROR, "connect: %s\n", strerror(errno)); goto fail; } } From 7bbb67d58005f3c0384f657570fabcdc0bc8cc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 20 Apr 2011 12:03:55 +0300 Subject: [PATCH 08/14] libavformat: Free AVFormatContext->streams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After switching this from a statically allocated array to a dynamically allocated one in the major bump, this needs explicit freeing. Signed-off-by: Martin Storsjö --- libavformat/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 0c80ff618e..19498b96a4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2564,6 +2564,7 @@ void avformat_free_context(AVFormatContext *s) av_freep(&s->chapters); av_metadata_free(&s->metadata); av_freep(&s->key); + av_freep(&s->streams); av_free(s); } From 26f6b8c571bcff7b325c7d6cc226c625dd465f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 20 Apr 2011 17:09:46 +0300 Subject: [PATCH 09/14] avio: Fix sanity checks in ffurl_read* This fixes e.g. reading data over HTTP, where the underlying socket is set to read/write. Signed-off-by: Anton Khirnov --- libavformat/avio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 074d3eeb86..0702aff007 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -289,14 +289,14 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int int ffurl_read(URLContext *h, unsigned char *buf, int size) { - if (h->flags & AVIO_FLAG_WRITE) + if (!(h->flags & AVIO_FLAG_READ)) return AVERROR(EIO); return retry_transfer_wrapper(h, buf, size, 1, h->prot->url_read); } int ffurl_read_complete(URLContext *h, unsigned char *buf, int size) { - if (h->flags & AVIO_FLAG_WRITE) + if (!(h->flags & AVIO_FLAG_READ)) return AVERROR(EIO); return retry_transfer_wrapper(h, buf, size, size, h->prot->url_read); } From 52512d0a4340895ba8bd9d2af48f256b969559d2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 12 Apr 2011 04:22:31 +0000 Subject: [PATCH 10/14] oggdec: use av_freep() instead of av_free() Signed-off-by: Anton Khirnov --- libavformat/oggdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index ce1152d3c2..d2725792e9 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -245,8 +245,8 @@ ogg_read_page (AVFormatContext * s, int *str) int n; for (n = 0; n < ogg->nstreams; n++) { - av_free(ogg->streams[n].buf); - av_free(ogg->streams[n].private); + av_freep(&ogg->streams[n].buf); + av_freep(&ogg->streams[n].private); } ogg->curidx = -1; ogg->nstreams = 0; From 14e3b120adb6e3c0337ffce2f595f85f2a1f33a2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 23 Mar 2011 04:31:01 +0000 Subject: [PATCH 11/14] Reduce picture size for yadif. Signed-off-by: Anton Khirnov --- libavfilter/vf_yadif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 176349a5c4..7a488d6aaa 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -150,7 +150,7 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, int w, { AVFilterBufferRef *picref; int width = FFALIGN(w, 32); - int height= FFALIGN(h+6, 32); + int height= FFALIGN(h+2, 32); int i; picref = avfilter_default_get_video_buffer(link, perms, width, height); @@ -159,7 +159,7 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, int w, picref->video->h = h; for (i = 0; i < 3; i++) - picref->data[i] += 3 * picref->linesize[i]; + picref->data[i] += picref->linesize[i]; return picref; } From 53f7628d38b8884016042f0d9527c71611d9182e Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Tue, 19 Apr 2011 19:37:29 -0400 Subject: [PATCH 12/14] update last major version increase dates in APIchanges --- doc/APIchanges | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 2c0d58519e..a9faaf927c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -1,13 +1,13 @@ Never assume the API of libav* to be stable unless at least 1 week has passed since the last major version increase. The last version increases were: -libavcodec: ? -libavdevice: ? -libavfilter: 2009-10-18 -libavformat: ? -libpostproc: ? -libswscale: ? -libavutil: 2009-03-08 +libavcodec: 2011-04-18 +libavdevice: 2011-04-18 +libavfilter: 2011-04-18 +libavformat: 2011-04-18 +libpostproc: 2011-04-18 +libswscale: 2011-04-18 +libavutil: 2011-04-18 API changes, most recent first: From 63de9e7d80ac3609fe378c5cadd5e899185846a7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 20 Apr 2011 17:18:27 +0200 Subject: [PATCH 13/14] Remove a version check in av_log made unnecessary by the big bump. --- libavutil/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/log.c b/libavutil/log.c index 72d2b914bd..deab11965d 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -91,7 +91,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl) line[0]=0; #undef fprintf if(print_prefix && avc) { - if(avc->version >= (50<<16 | 15<<8 | 3) && avc->parent_log_context_offset){ + if (avc->parent_log_context_offset) { AVClass** parent= *(AVClass***)(((uint8_t*)ptr) + avc->parent_log_context_offset); if(parent && *parent){ snprintf(line, sizeof(line), "[%s @ %p] ", (*parent)->item_name(parent), parent); From f83acb096c0ea1ec181941c141d1ab6fb24820eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 20 Apr 2011 21:22:08 +0300 Subject: [PATCH 14/14] Makefile: Include dependencies for test tools, too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes seek_test to be rebuilt when its dependencies has changed. The changes to the dependencies didn't usually matter in practice, but the introduction of side data in AVPacket required a recompilation. Signed-off-by: Martin Storsjö --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 0bf04d1d02..f8e68d6c49 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,7 @@ tools/%.o: tools/%.c $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $< -include $(wildcard tools/*.d) +-include $(wildcard tests/*.d) ffplay.o: CFLAGS += $(SDL_CFLAGS)