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)
commit4a59994e03178878bd22195d4509aea5fd97fc82
tree5105f781694661e0d0c8c15085416817fa642762
parentb2880a3de9e3e160c47c069abcc8cb60015407b6
parenta18ef7a76c735bcf78ed4825e33ad7f9f6f77a54
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>
libavutil/frame.h