[FFmpeg-cvslog] Merge commit '2240e92f052960693de55cf4924e80426dfaa965'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 16:36:21 2013 +0100| [7093b7534fd385263f678e48b7ef3177ad58da06] | committer: Michael Niedermayer

Merge commit '2240e92f052960693de55cf4924e80426dfaa965'

* commit '2240e92f052960693de55cf4924e80426dfaa965':
  atomic: Add include guards to the implementation headers
  lavc: update the fallback versions of ff_thread_*

Conflicts:
	libavcodec/utils.c

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

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