[FFmpeg-cvslog] avformat/qtpalette: Move ff_get_qtpalette() doxy to header

Michael Niedermayer git at videolan.org
Mon Dec 28 10:18:12 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Dec 28 03:18:20 2015 +0100| [ca9e3cb3ce7a6207570500e003ec2ed44836921e] | committer: Michael Niedermayer

avformat/qtpalette: Move ff_get_qtpalette() doxy to header

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca9e3cb3ce7a6207570500e003ec2ed44836921e
---

 libavformat/qtpalette.c |    9 ---------
 libavformat/qtpalette.h |    9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libavformat/qtpalette.c b/libavformat/qtpalette.c
index 2901122..770df56 100644
--- a/libavformat/qtpalette.c
+++ b/libavformat/qtpalette.c
@@ -28,15 +28,6 @@
 #include "libavutil/intreadwrite.h"
 #include "qtpalette.h"
 
-/**
- * Retrieve the palette (or "color table" in QuickTime terms), either
- * from the video sample description, or from the default Macintosh
- * palette.
- *
- * The file offset of the AVIOContext pointed to by the 'pb' variable
- * should be the start of the video sample description (the sample
- * description size and the data format).
- */
 int ff_get_qtpalette(int codec_id, AVIOContext *pb, uint32_t *palette)
 {
     int tmp, bit_depth, color_table_id, greyscale, i;
diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index 54da2a1..da83421 100644
--- a/libavformat/qtpalette.h
+++ b/libavformat/qtpalette.h
@@ -311,6 +311,15 @@ static const uint8_t ff_qt_default_palette_256[256 * 3] = {
   /* 255, 0xFF */  0x00, 0x00, 0x00
 };
 
+/**
+ * Retrieve the palette (or "color table" in QuickTime terms), either
+ * from the video sample description, or from the default Macintosh
+ * palette.
+ *
+ * The file offset of the AVIOContext pointed to by the 'pb' variable
+ * should be the start of the video sample description (the sample
+ * description size and the data format).
+ */
 int ff_get_qtpalette(int codec_id, AVIOContext *pb, uint32_t *palette);
 
 #endif /* AVFORMAT_QTPALETTE_H */



More information about the ffmpeg-cvslog mailing list