diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:23:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-08 00:23:37 +0100 |
| commit | 8e2bab5d4bddb4029503c0f90623854948ddb3c5 (patch) | |
| tree | 33a095ce0e92ed353c96c9b25b746ee45a2a00c7 /libavcodec/tableprint.h | |
| parent | 7023fb81c78e10a6a7af6e6bc8902f99da81c458 (diff) | |
| parent | 78212cefe14a2086dc1ea3778b76623b949e5d0c (diff) | |
| download | ffmpeg-8e2bab5d4bddb4029503c0f90623854948ddb3c5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
drawtext: remove typo
pcm-mpeg: implement new audio decoding api
w32thread: port fixes to pthread_cond_broadcast() from x264.
doc: add editor configuration section with Vim and Emacs settings
dxva2.h: include d3d9.h to define LPDIRECT3DSURFACE9
avformat/utils: Drop unused goto label.
doxygen: Replace '\' by '@' in Doxygen markup tags.
cosmetics: drop some completely pointless parentheses
cljr: simplify CLJRContext
drawtext: introduce rand(min, max)
drawtext: introduce explicit draw/hide variable
rtmp: Use nb_invokes for all invoke commands
Conflicts:
libavcodec/mpegvideo.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tableprint.h')
| -rw-r--r-- | libavcodec/tableprint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h index e126a72afb..1b39dc6ba1 100644 --- a/libavcodec/tableprint.h +++ b/libavcodec/tableprint.h @@ -58,7 +58,7 @@ void write_##type##_2d_array(const void *arg, int len, int len2)\ /** * @name Predefined functions for printing tables * - * \{ + * @{ */ void write_int8_t_array (const int8_t *, int); void write_uint8_t_array (const uint8_t *, int); @@ -69,7 +69,7 @@ void write_int8_t_2d_array (const void *, int, int); void write_uint8_t_2d_array (const void *, int, int); void write_uint32_t_2d_array(const void *, int, int); void write_float_2d_array (const void *, int, int); -/** \} */ // end of printfuncs group +/** @} */ // end of printfuncs group #define WRITE_ARRAY(prefix, type, name) \ do { \ |