diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 23:05:01 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 23:05:01 +0200 |
commit | d5a645625d876288021d8192e4e3199087a753fc (patch) | |
tree | 22a73c8dd0e3288b64f78ff3862aa7940b759434 /tests/ffserver-regression.sh | |
parent | 3d6635749ab2f3507a73cb450038118ae561d74c (diff) | |
parent | 4733a12dd17a91d606e0079ff9bb48b9f419cbef (diff) | |
download | ffmpeg-d5a645625d876288021d8192e4e3199087a753fc.tar.gz |
Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'
* commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef':
rtpdec_asf: Check memory allocation and free memory on error
Conflicts:
libavformat/rtpdec_asf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver-regression.sh')
0 files changed, 0 insertions, 0 deletions