diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:03:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-28 01:03:23 +0100 |
| commit | 151ae8ea5b54e12da6d53fa96d67026371e760ea (patch) | |
| tree | 892d2bff27e97e165819d75ebe0d6bb0872a295c /libavcodec/g723_1.c | |
| parent | 4ae7c3709958da7e0bd17cfebf1c947a84594c53 (diff) | |
| parent | b04d009b0e1a34b717f3d3bbf407aef0c742aff1 (diff) | |
| download | ffmpeg-151ae8ea5b54e12da6d53fa96d67026371e760ea.tar.gz | |
Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1':
qsv: rename to qsvdec
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1.c')
0 files changed, 0 insertions, 0 deletions