diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:17:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:17:10 +0100 |
| commit | 7e5300958885e8d7e81e4e0183580558183a9a5e (patch) | |
| tree | 728a4ef5bef3154b6457b1f9d41ff001c8259b69 /libavformat/asfdec.c | |
| parent | 41b8d154aa542f8b8cb02f0e7626081fa9ace9ec (diff) | |
| parent | 7c1e2e64667421f931ab48141517f19d309c7eea (diff) | |
| download | ffmpeg-7e5300958885e8d7e81e4e0183580558183a9a5e.tar.gz | |
Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'
* commit '7c1e2e64667421f931ab48141517f19d309c7eea':
rtpenc_xiph: Use AV_WB16 instead of manual bitshifts
Conflicts:
libavformat/rtpenc_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec.c')
0 files changed, 0 insertions, 0 deletions