diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 22:01:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-19 22:01:21 +0200 |
| commit | fb2d1b1b136bf71915dcd86ad7da97cb7d8c8e1e (patch) | |
| tree | ea3a8e5b269098f2c4d4054615c4db0fab8c476f /libavformat/txd.c | |
| parent | 91aa6d8a8b9b18ca9bf5f83ccbc6abb302403a0b (diff) | |
| parent | 1f64b018cbec018fa66a4a20f79958d9707913de (diff) | |
| download | ffmpeg-fb2d1b1b136bf71915dcd86ad7da97cb7d8c8e1e.tar.gz | |
Merge commit '1f64b018cbec018fa66a4a20f79958d9707913de' into release/2.4
* commit '1f64b018cbec018fa66a4a20f79958d9707913de':
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 'libavformat/txd.c')
0 files changed, 0 insertions, 0 deletions