diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 17:40:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-15 17:51:09 +0200 |
| commit | 042f9d62ca42a6ca26ef6ff23c6078c9ecc90c18 (patch) | |
| tree | fe6d6db2945987a5c10923fb28515361eea6eab2 /libavcodec/msmpeg4.h | |
| parent | e6cc30c22bb2007e4d66302d6477176ecf0c0877 (diff) | |
| parent | e3bc07f4af25287fa4ade1e9c5501de65c8a698e (diff) | |
| download | ffmpeg-042f9d62ca42a6ca26ef6ff23c6078c9ecc90c18.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Automatically add more flags required on symbian
mem.h: switch doxygen parameter order to match function prototype
doxygen: replace @sa tag by the more readable but equivalent @see
doxygen: use Doxygen markup for authors and web links where appropriate
doxygen: do not include license boilerplate in Doxygen documentation
ac3enc: Mark AVClasses const
ffserver: Replace two loops with one loop.
ffmpeg: Fix the check for experimental codecs
swscale: extend mmx padding.
swscale: clip unscaled colorspace conversion path.
doxygen: misc consistency cosmetics
doc: remove file name from @file directive in Doxygen usage example
doxygen: consistently place brief description
doxygen: place empty line between brief description and detailed description
avformat_open_input(): Add braces to shut up gcc warning.
Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4.h')
| -rw-r--r-- | libavcodec/msmpeg4.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index d8e3727a40..c9d42b48e8 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/** - * @file - */ - #ifndef AVCODEC_MSMPEG4_H #define AVCODEC_MSMPEG4_H |