Merge commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63'

Browse Source

* commit '3a6dfec864d569c2d0a875e1a7466f51b00edb63':
  segment: Check av_get_frame_filename() return value

Conflicts:
	libavformat/segment.c

No changes as there was no unchecked av_get_frame_filename() in segment.c

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

pull/105/head

Michael Niedermayer 10 years ago

parent 0c00e734ef 3a6dfec864

commit a915b1daee

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available