Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'

Browse Source

* commit '454697603e4efdfc04fadec40518d56c7dc1e5dd':
  mpegts: Use av_free() to free memory allocated by av_strdup()

Conflicts:
	libavformat/mpegtsenc.c

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

...

This commit is contained in:

Michael Niedermayer 2014-08-08 21:25:32 +02:00

parent 87dc8b3af9 454697603e

commit fd1e4d66f1

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