Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:40:50 +0000 (19:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:40:50 +0000 (19:40 +0200)
commitaa24729c213538f2f378696d40c5f5b38dc78d7e
treee66b92f4a95257f66e025c4d95d9d885ba1c93c2
parent66328da700c73246e2d4c5254905f9e5b4e0fa31
parent1c6d2bb9a9279d8df4e8bcdc1e1e2741723dc7c9
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors

Conflicts:
libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pcm-mpeg.c