Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  fft-test: Remove possibility of returning restricted exit code
  dct-test: Remove possibility of returning a restricted exit code
  base64-test: Remove posibility of returning restricted exit codes
  tree-test: Don't return restricted exit codes

Conflicts:
	libavutil/base64.c

See: b2fdf3fc35b6dca8ac7f6d46bd73ea5eb1339193
See: f80ca1cb002c53927fa3edaff5082bfba24d6193
See: cbbd0ac764b43df081898a2c3548a2fee1faca53
See: 5dfdffeb6fe9c43a496a4c1949cf9162474c7418
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-10-25 13:34:58 +02:00

parent 6abb9eb525 7177df90a0

commit d9ad305072

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available