Merge commit '4c5fa628da099dbb598c93bc4555b8733d2c3035'

Browse Source

* commit '4c5fa628da099dbb598c93bc4555b8733d2c3035':
  mov: Do not compute negative SAR values

Conflicts:
	libavformat/mov.c

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

...

This commit is contained in:

Michael Niedermayer 2015-01-23 22:19:21 +01:00

parent e40cdf8604 4c5fa628da

commit da304c529b

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