Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e'

Browse Source

* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
  pcmdec: replace a reachable assert with an error check

Conflicts:
	libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function

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

pull/43/merge

Michael Niedermayer 11 years ago

parent ee2c1e6dd3 38893dc028

commit 6732f4350d

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