aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-04 20:54:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-04 20:54:43 +0200
commit8c5897632a326c1d797f0bd45f97e0c83683412c (patch)
tree63f8e8d35db21e30670d63bf946494ca99b1c1a3 /libavformat/matroskadec.c
parentb34fce9c5470ac5a5d7cd3bb522768e6df1e4c3a (diff)
parentc4e764aa6980dd9dc7c423921b415ff7261c944a (diff)
downloadffmpeg-8c5897632a326c1d797f0bd45f97e0c83683412c.tar.gz
Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2
* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a': rtmpproto: Make sure to pass on the error code if read_connect failed Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
0 files changed, 0 insertions, 0 deletions