Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 01:18:58 +0000 (02:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 01:18:58 +0000 (02:18 +0100)
commit1db87da35141c34474644c677bad2cf3a408611d
treefe8223c22f7617eb782d2e31918164937d32fe33
parenta2bc6c116ddc15af47e092af874a0647d114a9f6
parent9cd4bc41760f8ad879e248920eacbe1e7757152c
Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'

* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
  ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dec.c
libavcodec/eac3dec.c
libavcodec/version.h