diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 22:27:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 22:33:28 +0200 |
| commit | 7618d360ca0b5c50c9893e45f7b0b3575ee9ccfc (patch) | |
| tree | 2d9c86fd8367c9f93134dbfd9ca0160efc1b7950 /libavcodec/x86 | |
| parent | c895fa7f66c01de6cfead8b1866dad478daad948 (diff) | |
| parent | 7703995a2e8760e66ff35148bf029e0f9e30dbe6 (diff) | |
| download | ffmpeg-7618d360ca0b5c50c9893e45f7b0b3575ee9ccfc.tar.gz | |
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
flac: Remove unused headers
Conflicts:
libavcodec/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions