Merge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'

Browse Source

* commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4':
  xbm: use av_frame_free on close

Conflicts:
	libavcodec/xbmenc.c

No change as the buggy code is not part of FFmpeg

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

...

This commit is contained in:

Michael Niedermayer 2014-03-28 04:45:24 +01:00

parent 8a8472dd49 792e4c21f2

commit 6bd05ed8bb

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