diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 21:20:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 21:20:25 +0100 |
| commit | f3b6a8f554e24e617f1428678bf5aafefc6b8fb9 (patch) | |
| tree | b23011721cacbc4de55bdc385ab6c65f0fac5f0e /libavcodec/libopus.h | |
| parent | a848cf63dcc1b3185f84f80ddbbf8f3a468f5cae (diff) | |
| parent | 53367b34e1156614e82ef7af888928f322566f88 (diff) | |
| download | ffmpeg-f3b6a8f554e24e617f1428678bf5aafefc6b8fb9.tar.gz | |
Merge commit '53367b34e1156614e82ef7af888928f322566f88'
* commit '53367b34e1156614e82ef7af888928f322566f88':
rtp: h264: Drop the asserts
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopus.h')
0 files changed, 0 insertions, 0 deletions