mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-06-01 17:37:45 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: movenc: fix NULL reference in mov_write_tkhd_tag rmdec: Reject invalid deinterleaving parameters rv34: Fix potential overreads rv34: Fix buffer size used for MC of B frames after a resolution change rv34: Avoid NULL dereference on corrupted bitstream rv10: Reject slices that does not have the same type as the first one vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag vsrc_color: set output pos values to -1 vsrc_color: add @file doxy vsrc_buffer: remove duplicated file description eval: implement not() expression eval: add sqrt function for computing the square root rmdec: use the deinterleaving mode and not the codec when creating audio packets. lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails Conflicts: doc/eval.texi doc/filters.texi libavcodec/rv10.c libavfilter/vsrc_color.c libavformat/rmdec.c libavutil/avutil.h libavutil/eval.c tests/ref/fate/eval Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a6186f3a00
5 changed files with 39 additions and 32 deletions
|
@ -476,8 +476,8 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
|
|||
goto fail;
|
||||
ic->pb = ic->pb ? ic->pb : pb; // don't leak custom pb if it wasn't set above
|
||||
|
||||
*ic_ptr = ic;
|
||||
fail:
|
||||
*ic_ptr = ic;
|
||||
av_dict_free(&opts);
|
||||
return err;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue