Merge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:38:26 +0000 (00:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:39:26 +0000 (00:39 +0200)
commitaecd064744c846faf7c7df76d0ecca720f314e52
tree587943e9f458bf8545c7ddb5a3e46b6bcb51a09c
parent5e7524195c6a69e887c28976304db70e94d9eea4
parent803e82276b3716bf6012ec69e8854dae14a4fd2b
Merge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'

* commit '803e82276b3716bf6012ec69e8854dae14a4fd2b':
  libavformat: Check mkdir return error codes

Conflicts:
libavformat/hdsenc.c
libavformat/smoothstreamingenc.c

See: c89f8f80cc83622471eaf99e451e78df68475e19
See: a3886ea3c5947ca05bfe01b053d9ce2f9725d9eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hdsenc.c
libavformat/smoothstreamingenc.c