Merge commit 'c39f7eba01cd656e8f0eed592f93d11814736650'

Browse Source

* commit 'c39f7eba01cd656e8f0eed592f93d11814736650':
  truemotion2: Use av_freep properly in an error path

Conflicts:
	libavcodec/truemotion2.c

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

pull/36/head

Michael Niedermayer 12 years ago

parent 028f8c3ecb c39f7eba01

commit 8fc441cee8

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