diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 23:06:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 23:08:55 +0100 |
| commit | 287eb69973f8066a68e924bdf9433b2faad01dfa (patch) | |
| tree | e9741a866e820b7758d4f495be1a911544555dee /libavcodec/wavpack.h | |
| parent | e0c36f58257f015296a391c5bac763f1aec9a6e2 (diff) | |
| parent | 443502aed8b814d883825e52e91e4f018955aa66 (diff) | |
| download | ffmpeg-287eb69973f8066a68e924bdf9433b2faad01dfa.tar.gz | |
Merge commit '443502aed8b814d883825e52e91e4f018955aa66'
* commit '443502aed8b814d883825e52e91e4f018955aa66':
dvbsubdec: move shared codepath
Conflicts:
libavcodec/dvbsubdec.c
The merged code is ignored and the factorization redone with
the code that is in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wavpack.h')
0 files changed, 0 insertions, 0 deletions