-
- Downloads
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>
No related branches found
No related tags found
Showing
- libavcodec/rv10.c 3 additions, 1 deletionlibavcodec/rv10.c
- libavformat/movenc.c 1 addition, 1 deletionlibavformat/movenc.c
- libavformat/rmdec.c 33 additions, 28 deletionslibavformat/rmdec.c
- libavformat/utils.c 1 addition, 1 deletionlibavformat/utils.c
- libavutil/avutil.h 1 addition, 1 deletionlibavutil/avutil.h
Loading
Please register or sign in to comment