[FFmpeg-cvslog] Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 18 19:50:55 2014 +0200| [f47751a56cc470c90f9761afd510e5a6560340f9] | committer: Michael Niedermayer

Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'

* commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b':
  doc: Change wrong term to avoid confusion

Conflicts:
	doc/developer.texi

No change, as the wrong term is not part of our docs

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f47751a56cc470c90f9761afd510e5a6560340f9
---