diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 16:57:40 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-01 16:57:40 +0100 |
commit | a78d9abee0dfef2dc86e711e27b474e7d07dca2e (patch) | |
tree | 341560b9446ee0a9813b5b32028c153d3fa8c984 /libavformat/avformatres.rc | |
parent | 42ff56e362e823f5292c0d661fd35778da2d7eef (diff) | |
parent | 72d658766e6ccf198317dffd6499c5e288847a1c (diff) | |
download | ffmpeg-a78d9abee0dfef2dc86e711e27b474e7d07dca2e.tar.gz |
Merge commit '72d658766e6ccf198317dffd6499c5e288847a1c'
* commit '72d658766e6ccf198317dffd6499c5e288847a1c':
mp3dec: replace avpriv_mpa_decode_header with avpriv_mpegaudio_decode_header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/avformatres.rc')
0 files changed, 0 insertions, 0 deletions