diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 04:30:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 04:30:46 +0100 |
| commit | c30281164352ac33a06b155730fe669485852669 (patch) | |
| tree | 9053caa293ae74b28d20da24577fa88932b9d316 /libavcodec/wmavoice.c | |
| parent | f65afef1df49f53e14c8d4173ff960fff8d44ecb (diff) | |
| parent | c255f0b001da3afa4709f5378680880b8a2dbe61 (diff) | |
| download | ffmpeg-c30281164352ac33a06b155730fe669485852669.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: initialize hwaccel_pix_fmt
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmavoice.c')
0 files changed, 0 insertions, 0 deletions