FFmpeg

mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-24 02:42:35 +08:00

Files

Michael Niedermayer 60dbed6067 Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'

* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
  cosmetics: Write NULL pointer inequality checks more compactly

Conflicts:
	libavcodec/dvdsubdec.c
	libavcodec/h263dec.c
	libavcodec/libxvid.c
	libavcodec/rv10.c
	libavcodec/utils.c
	libavformat/format.c
	libavformat/matroskadec.c
	libavformat/segment.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-08-15 21:26:12 +02:00

fate

tests/fate/libavutil: switch cpu-test back to runecho so its results are vissible

2014-08-06 01:57:35 +02:00

filtergraphs

Merge remote-tracking branch 'qatar/master'

2014-03-16 14:32:47 +01:00

ref

avfilter/select: larger pixel sad computation

2014-08-14 19:11:13 +02:00

audiogen.c

Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'