aboutsummaryrefslogtreecommitdiffstats
path: root/doc/APIchanges
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-24 22:19:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-24 22:19:41 +0100
commit26dad980baaa6858561b3269d375c1d9223f579c (patch)
tree0607c7efcc3799b9f4ffe9f7f6c4b3844d691cc9 /doc/APIchanges
parent6b06f9f1bc4c51a96186021bf0f99599e49aff47 (diff)
parent48d1ed9c83ee0c388e8c2898e81ffb4add509ab9 (diff)
downloadffmpeg-26dad980baaa6858561b3269d375c1d9223f579c.tar.gz
Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9': doc: name correct header Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
-rw-r--r--doc/APIchanges2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 0f6aed3d9b..e52b4489d3 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -139,7 +139,7 @@ API changes, most recent first:
2013-11-04 - xxxxxxx - lavu 52.50.100 - avutil.h
Add av_fopen_utf8()
-2013-10-31 - 78265fc / 28096e0 - lavu 52.49.100 / 52.17.0 - avframe.h
+2013-10-31 - 78265fc / 28096e0 - lavu 52.49.100 / 52.17.0 - frame.h
Add AVFrame.flags and AV_FRAME_FLAG_CORRUPT.
2013-10-27 - xxxxxxx - lavc 55.39.100 - avcodec.h