Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:29:58 +0000 (04:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 02:29:58 +0000 (04:29 +0200)
commit73e6af9d7b56f12d8676ff919f4acc6c9991d985
tree059e6a6f2697ddccb7554ffcf9d36dd0b421bb9d
parentdbd94b771f1b1a90591e556edb65c91a34f994b6
parent17aa81d94781c6f62dc7d1dbd1f8891c020c9905
Merge commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905'

* commit '17aa81d94781c6f62dc7d1dbd1f8891c020c9905':
  hqx: Merge invalid format check within switch block

Conflicts:
libavcodec/hqx.c

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