diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 12:24:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 12:26:36 +0100 |
| commit | c88ae843da4a9589a6ef1138fb9d9aaa28add2d3 (patch) | |
| tree | 143fdad22f62f06a694345b27f1f6edd38a3a1aa /libavformat/librtmp.c | |
| parent | 91a9ae5b6bbfba611393eca1694417e6329f9bf3 (diff) | |
| parent | 8b573ddda75980f724f779ff75aacc2ff81d9e0e (diff) | |
| download | ffmpeg-c88ae843da4a9589a6ef1138fb9d9aaa28add2d3.tar.gz | |
Merge commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e'
* commit '8b573ddda75980f724f779ff75aacc2ff81d9e0e':
hevc: remove superfluous assignments and checks
Conflicts:
libavcodec/hevc.c
See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/librtmp.c')
0 files changed, 0 insertions, 0 deletions