diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:27:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:28:34 +0200 |
| commit | 4b0fa45b842cb1a6721f4e83edd09400c35162fd (patch) | |
| tree | d23c8f30dc9db2e52d5b90a28995d60150071f99 /libavformat/ac3dec.c | |
| parent | 521f5697348d96ac7c725bc2cba14d6ce4944334 (diff) | |
| parent | b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5 (diff) | |
| download | ffmpeg-4b0fa45b842cb1a6721f4e83edd09400c35162fd.tar.gz | |
Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'
* commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5':
libgsm: Split decoder and encoder
Conflicts:
libavcodec/libgsmenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ac3dec.c')
0 files changed, 0 insertions, 0 deletions