FFmpeg/ffm at 7846280d1da5e4929bb8fb5adcc4b0c017535bea - FFmpeg - Gitea: Git with a cup of tea

virtualenv/FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00

Michael Niedermayer f1b5693027 Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/libx264.c
	libavcodec/v210enc.c
	libavfilter/src_movie.c
	libavformat/version.h
	libavutil/opt.c

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

2011-09-07 22:58:39 +02:00

4 lines

137 B

Plaintext

Raw Blame History

	`58a0235967d10543268184eea50a3b65 *./tests/data/lavf/lavf.ffm`
	`376832 ./tests/data/lavf/lavf.ffm`
	`./tests/data/lavf/lavf.ffm CRC=0xf361ed74`