diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-14 22:53:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-14 22:54:49 +0100 |
| commit | 829099545bf32c28236f8caa5558b81d25efcf91 (patch) | |
| tree | c0ec7ce6076e8ecf338c1c67d738deac2aee55f9 /libavcodec/wma_common.c | |
| parent | 27f2e211aa6d0f9b5b4e4c04d3a3567423085d49 (diff) | |
| parent | fd665f7f48fa7db89eb9a93ac33919f6adc40f9d (diff) | |
| download | ffmpeg-829099545bf32c28236f8caa5558b81d25efcf91.tar.gz | |
Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'
* commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d':
avconv: Use the mpeg12 private option scan_offset
Conflicts:
ffmpeg_opt.c
See: e479013ae41050ad9b76429d8c6ab70684cddc93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma_common.c')
0 files changed, 0 insertions, 0 deletions