ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Tue May
19 22:01:11 2015 +0200| [fb2d1b1b136bf71915dcd86ad7da97cb7d8c8e1e] | committer:
Michael Niedermayer
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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb2d1b1b136bf71915dcd86ad7da97cb7d8c8e1e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
