Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'

Browse Source

* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
  dv: Drop a spurious check

Conflicts:
	libavcodec/dvdec.c

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

pull/96/head

Michael Niedermayer 10 years ago

parent a2f05d3337 74d7db586a

commit 89e705cd5c

1 changed files with 1 additions and 1 deletions

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

Write Preview

Loading…

Cancel

Save