Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 20:26:13 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 20:34:24 +0000 (21:34 +0100)
commitd64b8540751bf8debab4ebcfad6ff87c61d3c19d
treea275f8c86ca44c3fa3743b91702b3f8c8f9fbcff
parent212b89f8b426d78e1be8be45daaa6604fd0f35c4
parent666fe5da47d127074be7f0e2bac93db6af8b4a30
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@gmx.at>
Changelog
ffmpeg_opt.c
libavutil/Makefile
tests/lavf-regression.sh