diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-27 11:20:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-27 11:20:13 +0200 |
| commit | 01a0612c7081954e2bdeb24230daffff8625777b (patch) | |
| tree | 47663f8a04ea6758b8d3e8f377eb0a8d147cc6d9 /libavcodec/opt.h | |
| parent | dcf1830a15a1e9ad1e16086369d55d8cb3a14e83 (diff) | |
| parent | a8d89df367859e5addd8bdbbebb4d787493397da (diff) | |
| download | ffmpeg-01a0612c7081954e2bdeb24230daffff8625777b.tar.gz | |
Merge branch 'release/0.8' into release/0.7
* release/0.8: (82 commits)
Fix version numbers
rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API.
udp: allow fifo size to be tuned seperately
riff: Add mpgv MPEG-2 fourcc
Update Changelog
matroskadec: fix integer underflow if header length < probe length.
ffmpeg: fix operation with --disable-avfilter
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
build: Create mlib optimization directories during out-of-tree builds.
changelog: misc typo and wording fixes (cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc)
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)
matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
Update RELEASE file
update Changelog
mt: proper locking around release_buffer calls.
vp8/mt: flush worker thread, not application thread context, on seek.
docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
docs: Use proper markup for a literal command line option
docs: Don't recommend adding --enable-memalign-hack
docs: Remove needless configure options
...
Conflicts:
VERSION
libavcodec/opt.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/opt.h')
| -rw-r--r-- | libavcodec/opt.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/opt.h b/libavcodec/opt.h index 95147595b7..505377d7d9 100644 --- a/libavcodec/opt.h +++ b/libavcodec/opt.h @@ -19,6 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * This header is provided for compatibility only and will be removed + * on next major bump + */ + #ifndef AVCODEC_OPT_H #define AVCODEC_OPT_H |