diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:04:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 12:20:04 +0200 |
| commit | 52e40155a8e1f41b2d97e5832022263b77752f32 (patch) | |
| tree | 6a0e74576fa02d3794ba5110c84130a2884841c1 /libavcodec | |
| parent | 369e5dcfc530576293998ea35137b8cc35aee412 (diff) | |
| parent | e544782623caf1eb4b2429e9c4f35d6b627accba (diff) | |
| download | ffmpeg-52e40155a8e1f41b2d97e5832022263b77752f32.tar.gz | |
Merge commit 'e544782623caf1eb4b2429e9c4f35d6b627accba'
* commit 'e544782623caf1eb4b2429e9c4f35d6b627accba':
riff: Move guid structs and helper functions into riff
Conflicts:
libavformat/asf.h
libavformat/riff.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions