diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-06 16:36:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-06 16:37:08 +0200 |
| commit | 7d03e60c124be3e316636b0086910f1bcc1a797d (patch) | |
| tree | 220474e6a324e3ab52b4bbd421bd01a668347dda /libavformat/unix.c | |
| parent | a97f7499909a589249844c46e54ff25bc2ae7720 (diff) | |
| parent | 86f4c59bd676672040b89d8fea4c9e3b59bfe7ab (diff) | |
Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'
* commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab':
twinvq: Split VQF-specific part from common TwinVQ decoder core
Conflicts:
libavcodec/Makefile
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/unix.c')
0 files changed, 0 insertions, 0 deletions