Merge commit '16216b713f9a21865cc07993961cf5d0ece24916'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:39:15 +0000 (14:39 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:39:15 +0000 (14:39 +0100)
commit362028cac913e232ce8c3702fa4c96b33fc5e0de
tree9ddb25aabdab4278d23fb61c72735f4250ea588f
parent2630f7f709049113dc03d6b999efad6acc423d67
parent16216b713f9a21865cc07993961cf5d0ece24916
Merge commit '16216b713f9a21865cc07993961cf5d0ece24916'

* commit '16216b713f9a21865cc07993961cf5d0ece24916':
  lavc: Drop exporting 2-pass encoding stats

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/aacenc.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/version.h