Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  movenchint: Clear size and len if the realloc failed

Conflicts:
	libavformat/movenchint.c

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

...

This commit is contained in:

Michael Niedermayer 2013-09-23 14:47:01 +02:00

parent 8c766228c1 b6c7bd53f4

commit 552945efe6

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