[FFmpeg-cvslog] Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 21:26:13 2013 +0100| [d64b8540751bf8debab4ebcfad6ff87c61d3c19d] | committer: Michael Niedermayer

Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30':
  atomic: Exclude the unsupported implementation headers from checkheaders
  avconv: do not silently ignore unused codec AVOptions.

Conflicts:
	ffmpeg_opt.c

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

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