Merge commit '96138e8c8da4b9397e627c934a33c22988d1192b'

Browse Source

* commit '96138e8c8da4b9397e627c934a33c22988d1192b':
  isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-31 01:51:34 +02:00

parent 36d37edf01 96138e8c8d

commit 20bc5924a0

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available