Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 21:19:55 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 21:21:56 +0000 (22:21 +0100)
commit9d921cce4f5501e4c507cc921f76a283bee39d09
tree72ed53954ff80a4ee65891b745916991ce6271eb
parentbcc43de51f37013621934991086a5d6dcb94f493
parent3a56bcee7cb7549b2813e39ce3bee3b7c522aecb
Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'

* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
  mpeg12dec: Use more specific error codes

Conflicts:
libavcodec/mpeg12dec.c

See: 1852b2a0f497d3c5437d5b50379d7874fc8c285a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12dec.c