OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2880a3 a18ef7a)
Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 20:55:16 +0000 (21:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 20:55:16 +0000 (21:55 +0100)
* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54':
  doc: fix a couple of typos in frame.h

Conflicts:
libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/frame.h patch | diff1 | diff2 | blob | history

diff --cc libavutil/frame.h
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help