Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'

* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54': doc: fix a couple of typos in frame.h Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 4a59994e03
parent b2880a3de9 a18ef7a76c
commit 4a59994e03
1 changed files with 1 additions and 1 deletions
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@ -596,7 +596,7 @@ AVFrame *av_frame_alloc(void);
 void av_frame_free(AVFrame **frame);

 /**
- * Setup a new reference to the data described by a given frame.
+ * Set up a new reference to the data described by the source frame.
 *
 * Copy frame properties from src to dst and create a new reference for each
 * AVBufferRef from src.