diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 20:48:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-26 20:48:07 +0200 |
| commit | ffa90d99fd8933b17917045a3768bb9dcfb56f72 (patch) | |
| tree | 0d307a55c1ed7a8d826e81f861b0adf87c53a37d /doc | |
| parent | 7206221d563e6d1d6bf2d5acd3b1378d77c7b7e4 (diff) | |
| parent | 56a721f020273d69daa8dcb0d99e42a43a0a0d4d (diff) | |
| download | ffmpeg-ffa90d99fd8933b17917045a3768bb9dcfb56f72.tar.gz | |
Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d'
* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
doc: fix a typo
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index a414b418dc..a2dcb2c692 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -189,7 +189,7 @@ API changes, most recent first: Add av_gettime_relative() av_gettime_relative_is_monotonic() 2014-05-15 - eacf7d6 / 0c1959b - lavf 55.38.100 / 55.17.0 - avformat.h - Add AVMFT_FLAG_BITEXACT flag. Muxers now use it instead of checking + Add AVFMT_FLAG_BITEXACT flag. Muxers now use it instead of checking CODEC_FLAG_BITEXACT on the first stream. 2014-05-15 - 96cb4c8 - lswr 0.19.100 - swresample.h |