Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:57:25 +0000 (04:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:57:25 +0000 (04:57 +0100)
commit988d27b8029d9b4ccb13e792004cc8375b835eac
tree8931c74a18dcf3876f6db7569a7404b64ed5abab
parent76a8127a452f9e149a876c5fa6d6f0634e3b5b1e
parentb1306823d0b3ae998c8e10ad832004eb13bdd93e
Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'

* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
  check memory errors from av_strdup()

Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
ffmpeg_opt.c
libavformat/matroskaenc.c
libavutil/opt.c