Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:56:33 +0000 (21:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:56:33 +0000 (21:56 +0200)
commitfca76dc61ed650477c6e537b9db7c4ae2767197b
treec01c02fc8e7e628da3eb9662a3a57e1ed84d6e59
parent2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe
parent13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9
Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'

* commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9':
  adts: Return more meaningful error codes

Conflicts:
libavformat/adtsenc.c

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