diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:49:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:49:30 +0200 |
| commit | 8012f93ed8afbf0b45fa378085cd4b000e30057f (patch) | |
| tree | e8bc66eff6cdafb5e54eaabd069c97286e5c17d0 /libavdevice/v4l2enc.c | |
| parent | aa6cf4c1b050a387f99c1545a8f8029095da1cce (diff) | |
| parent | 5074f4545c439420daebe4c2f28ed216440b6ec7 (diff) | |
| download | ffmpeg-8012f93ed8afbf0b45fa378085cd4b000e30057f.tar.gz | |
Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7'
* commit '5074f4545c439420daebe4c2f28ed216440b6ec7':
wavpack demuxer: export full wavpack blocks.
Conflicts:
libavformat/wv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/v4l2enc.c')
0 files changed, 0 insertions, 0 deletions