diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:30:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:31:39 +0200 |
| commit | 55231323b0fdc84a529418d673148cf1f3157229 (patch) | |
| tree | 1771ba123fc921a3ff05868b00243ec876802666 /libavfilter/avf_concat.c | |
| parent | 73b8155b31ec7ad1132ecf5c45ac82acadeb28e5 (diff) | |
| parent | 254f3daba4271c1918d9a7ad155b1442ef93ed29 (diff) | |
| download | ffmpeg-55231323b0fdc84a529418d673148cf1f3157229.tar.gz | |
Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'
* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
nut: Make sure to clean up on read_header failure
Conflicts:
libavformat/nutdec.c
See: 361702660d2c37a63b7d6381d39e1e1de8405260
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_concat.c')
0 files changed, 0 insertions, 0 deletions