diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:47:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:47:47 +0200 |
| commit | 93f244e3abc3d75a797535a8da890bb1f9932433 (patch) | |
| tree | 8278955c098813fafdf58a5b4011b13f25b7ee03 /libavformat/avformat.h | |
| parent | b0554fec0470bf59b0582c80697d28646e37b854 (diff) | |
| parent | 0af1fe845a9d7112da0a58d33a4fc81fe7c47e95 (diff) | |
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
avformat: Fix references to the removed function av_write_header in comments
changelog: Mention the MSVC DLL support
fate: add dependencies for misc microsoft codecs
fate-twinvq: add dependencies
fate-mpc: add dependencies
fate-indeo: add dependencies
fate-als: add dependencies
fate: dependencies for demux tests
Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a4d97c1d4b..ba2977144b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -673,7 +673,7 @@ typedef struct AVStream { * of which frame timestamps are represented. * * decoding: set by libavformat - * encoding: set by libavformat in av_write_header. The muxer may use the + * encoding: set by libavformat in avformat_write_header. The muxer may use the * user-provided value of @ref AVCodecContext.time_base "codec->time_base" * as a hint. */ @@ -1743,7 +1743,7 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, * Write the stream trailer to an output media file and free the * file private data. * - * May only be called after a successful call to av_write_header. + * May only be called after a successful call to avformat_write_header. * * @param s media file handle * @return 0 if OK, AVERROR_xxx on error |