diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-15 13:47:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-15 13:47:12 +0100 |
| commit | c5eb725fd33ee705c3c7d674ae65bbb717bf7207 (patch) | |
| tree | 27998b149b222fdb19fd20fd78b7365a7f1b731a /libavformat/rtmppkt.c | |
| parent | 9fb5a91c66934dab395ff32eb524a3dbe08b53d8 (diff) | |
| parent | 8a9641a652ed1546fedfda22584f79d3d423096e (diff) | |
Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'
* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
bsf: check memory allocations
Conflicts:
libavcodec/noise_bsf.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtmppkt.c')
0 files changed, 0 insertions, 0 deletions