diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 22:07:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 22:27:17 +0200 |
| commit | 39edcadc07e90c551596e74a932b603eea0c8b01 (patch) | |
| tree | b197f9d9e96d441aa2b38e6f7e0234f6e7562ed2 /libavutil/des.c | |
| parent | d35efda21a146ad437e194cf124e3ca170bfc82e (diff) | |
| parent | fbd8e042107ec63e0ddf155588c59dcb76007641 (diff) | |
| download | ffmpeg-39edcadc07e90c551596e74a932b603eea0c8b01.tar.gz | |
Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'
* commit 'fbd8e042107ec63e0ddf155588c59dcb76007641':
mp3dec: move XING/Info and VBRI parsing into their own functions
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/des.c')
0 files changed, 0 insertions, 0 deletions