Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'

Browse Source

* commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d':
  audiointerleave: check av_new_packet return value

Conflicts:
	libavformat/audiointerleave.c

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

pull/75/merge

Michael Niedermayer 10 years ago

parent 1945db1f13 1967cd4e4c

commit 6d2a2bfb59

1 changed files with 4 additions and 3 deletions

Whitespace

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

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save