Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'

Browse Source

* commit '02a7a5e330ec4373a761f63c292220a1de13b968':
  vc1test: Check malloc call

Conflicts:
	libavformat/vc1test.c

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

pull/76/merge

Michael Niedermayer 11 years ago

parent d95a04547a 02a7a5e330

commit 3a29af4efc

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available