Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'

Browse Source

* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

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

pull/64/head

Michael Niedermayer 11 years ago

parent 8e8276e0bc 9bd4a9f4ee

commit 36d37edf01

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

Diff Content Not Available