diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 00:32:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-04 00:32:31 +0200 |
| commit | 86e107a7d468666189506d3edd4f4b5ca14cd59e (patch) | |
| tree | 7270750bbe78c241461a844d7c1c8de3696e3765 /libavfilter/formats.h | |
| parent | af392efe51d5cc3536cb3c75bce8954179222d18 (diff) | |
| parent | 1a068bfefd5da09f596e5079b39b418933bad0ea (diff) | |
| download | ffmpeg-86e107a7d468666189506d3edd4f4b5ca14cd59e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Consistently use C-style comments with multiple inclusion guards
anm: fix a few Doxygen comments
misc typo and wording fixes
attributes: add av_noreturn
attributes: drop pointless define guards
configure: do not disable av_always_inline with --enable-small
flvdec: initial stream switch support
avplay: fix write on freed memory for rawvideo
snow: remove a VLA used for edge emulation
x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
snow: remove the runs[] VLA.
snow: Check mallocs at init
flacdec: remove redundant setting of avctx->sample_fmt
Conflicts:
ffplay.c
libavcodec/h264.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowdec.c
libavcodec/snowenc.c
libavformat/flvdec.c
libavutil/attributes.h
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/formats.h')
| -rw-r--r-- | libavfilter/formats.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 1de10ca768..f884294cf0 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -221,4 +221,4 @@ void ff_formats_unref(AVFilterFormats **ref); */ void ff_formats_changeref(AVFilterFormats **oldref, AVFilterFormats **newref); -#endif // AVFILTER_FORMATS_H +#endif /* AVFILTER_FORMATS_H */ |