Merge commit 'f918b8a2933a65020cbe490ec637d5485c11a692'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Nov 2014 19:24:06 +0000 (20:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Nov 2014 19:24:11 +0000 (20:24 +0100)
commitf3dcabef33249b6e900edd9e601dbac0a8899876
treeae87cb69a1219c50c88a2acbf1507f3673c9fa14
parent660a8b43abdbafd746e78184703ea29b774cb3ae
parentf918b8a2933a65020cbe490ec637d5485c11a692
Merge commit 'f918b8a2933a65020cbe490ec637d5485c11a692'

* commit 'f918b8a2933a65020cbe490ec637d5485c11a692':
  hdsenc: Use the right filename in an error message

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