On Fri, Apr 08, 2011 at 11:37:24PM -0400, Alexander Strange wrote: > > On Apr 8, 2011, at 5:48 AM, Anton Khirnov wrote: > > > --- > > libavformat/avformat.h | 4 +++- > > libavformat/utils.c | 4 ++++ > > libavformat/version.h | 3 +++ > > 3 files changed, 10 insertions(+), 1 deletions(-) > > > > diff --git a/libavformat/avformat.h b/libavformat/avformat.h > > index 61babdc..6b1b2b4 100644 > > --- a/libavformat/avformat.h > > +++ b/libavformat/avformat.h > > @@ -978,7 +978,6 @@ void av_hex_dump_log(void *avcl, int level, uint8_t > > *buf, int size); > > */ > > void av_pkt_dump2(FILE *f, AVPacket *pkt, int dump_payload, AVStream *st); > > > > -attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int > > dump_payload); > > > > /** > > * Send a nice dump of a packet to the log. > > @@ -994,7 +993,10 @@ attribute_deprecated void av_pkt_dump(FILE *f, > > AVPacket *pkt, int dump_payload); > > void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int > > dump_payload, > > AVStream *st); > > > > +#if FF_API_PKT_DUMP > > +attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int > > dump_payload); > > attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket > > *pkt, > > +#endif > > int dump_payload); > > Misplaced #endif >
Oops, I wonder how it got there. Thanks for spotting it. -- Anton Khirnov
From 65757f8eb687173fbc37a4898ce773e09c99a165 Mon Sep 17 00:00:00 2001 From: Anton Khirnov <[email protected]> Date: Sat, 9 Apr 2011 07:30:33 +0200 Subject: [PATCH] avformat.h: fix a misplaced #endif --- libavformat/avformat.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5c8456f..24c7958 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -998,8 +998,8 @@ void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload, #if FF_API_PKT_DUMP attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload); attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, -#endif int dump_payload); +#endif /** * Initialize libavformat and register all the muxers, demuxers and -- 1.7.4.1
signature.asc
Description: Digital signature
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
