highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2

Browse Source 
* commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d':
  doc: fix a couple of typos in frame.h

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-11 12:09:13 +01:00
parent bb116e6ba3 45acc228a6
commit ff1e982205
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/frame.h
View File

@@ -596,7 +596,7 @@ AVFrame *av_frame_alloc(void);
void av_frame_free(AVFrame **frame); 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 * Copy frame properties from src to dst and create a new reference for each
* AVBufferRef from src. * AVBufferRef from src.