generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  fate: make compare() function compatible with POSIX bc
  Update Janne's email address.
  APIchanges: Replace Subversion revision numbers by Git hashes.
  bytestream: Eliminate one level of pointless macro indirection.
  xwd: convert to bytestream2.
  vqavideo: port to bytestream2 API
  Read preset files with suffix .avpreset
  prores: allow user to set fixed quantiser
  lavf: remove some disabled code.
  lavf: only set average frame rate for video.
  lavf: remove a pointless check.
  avcodec: add XBM encoder

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vqavideo.c
	libavformat/img2enc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-03-18 23:12:35 +01:00
parent 7f4c5ab8a1 a56fba502e
commit bae053fca4
20 changed files with 464 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/ref/fate/vqa-cc
View File

@@ -70,7 +70,6 @@
1, 53654, 53654, 1470, 2940, 0xac8bb6c8
0, 37, 37, 1, 192000, 0xb58c1566
1, 55124, 55124, 1470, 2940, 0xa503c73b
0, 38, 38, 1, 192000, 0xb58c1566
1, 56594, 56594, 1470, 2940, 0x7cd588a3
1, 58064, 58064, 1470, 2940, 0xa6974b04
1, 59534, 59534, 1470, 2940, 0xbf448241