[SCM] libav/experimental: Cygwin don't like this function declaration. So move this self-documentation into a comment instead.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:08:13 UTC 2013
The following commit has been merged in the experimental branch:
commit f1bf85b8cfa8b841122fc80ba61204324d5727a9
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Mon Oct 15 21:41:01 2007 +0000
Cygwin don't like this function declaration.
So move this self-documentation into a comment instead.
Originally committed as revision 10743 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index 298dc15..f75346f 100644
--- a/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@ -60,10 +60,11 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head)
/**
+ * nodes size must be 2*nb_codes
* first nb_codes nodes.count must be set
*/
int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
- Node nodes[2*nb_codes], huff_cmp_t cmp, int hnode_first)
+ Node *nodes, huff_cmp_t cmp, int hnode_first)
{
int i, j;
int cur_node;
diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 0474fba..ec3c0c9 100644
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -33,6 +33,6 @@ typedef struct {
typedef int (*huff_cmp_t)(const void *va, const void *vb);
int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
- Node nodes[2*nb_codes], huff_cmp_t cmp, int hnode_first);
+ Node *nodes, huff_cmp_t cmp, int hnode_first);
#endif /* AVCODEC_HUFFMAN_H */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list