diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:23:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:23:26 +0100 |
| commit | 17773f49b7da49ceecc4b6260d5ded6938f9b163 (patch) | |
| tree | 931f84efb95880bc513ef45449739178e0587406 /compat | |
| parent | 0f8de2b5f17b051d2cfdf1ba25c2990368df1a27 (diff) | |
| parent | 3567b91e49c6ae101c9a35c90f46b8ad9890ac15 (diff) | |
| download | ffmpeg-17773f49b7da49ceecc4b6260d5ded6938f9b163.tar.gz | |
Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'
* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
rtpdec_hevc: Share the implementation of fragmented packets with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions