]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:14:10 +0000 (20:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:23:41 +0000 (20:23 +0100)
* commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a':
  ac3tab.h: #include the correct headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ac3tab.h

Simple merge