diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 21:55:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 21:55:16 +0100 |
| commit | 4a59994e03178878bd22195d4509aea5fd97fc82 (patch) | |
| tree | 5105f781694661e0d0c8c15085416817fa642762 | |
| parent | b2880a3de9e3e160c47c069abcc8cb60015407b6 (diff) | |
| parent | a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54 (diff) | |
| download | ffmpeg-4a59994e03178878bd22195d4509aea5fd97fc82.tar.gz | |
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>
| -rw-r--r-- | libavutil/frame.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 0cb5fb72ae..9fedba8635 100644 --- 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. |