diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 13:27:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 13:27:33 +0100 |
| commit | bd34e26b27e9ec83727dedd1c04c40d8a245cfa8 (patch) | |
| tree | b1b9eebb64b644361b38aae2fa00fb2a6b9cfb40 /libswresample/arm | |
| parent | 9456a8628b4054d11c0b652ee0d4f1b61c3b9464 (diff) | |
| parent | 0e2c3ee9a335d8a0a5edf0509e222e804d7b2619 (diff) | |
| download | ffmpeg-bd34e26b27e9ec83727dedd1c04c40d8a245cfa8.tar.gz | |
Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
lavc: give a typedeffed name to the AVPacket.side_data struct
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/arm')
0 files changed, 0 insertions, 0 deletions