Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 09:34:07 +0000 (11:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 09:34:07 +0000 (11:34 +0200)
commit5f312139dff4072c3482a0b01daafcc1446d70c8
tree8209d82a04b408e2d7a77a6588239b87948a2bec
parent03853b1091e4a60c772677aa885e3d7e0ff19a12
parent45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c
Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'

* commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c':
  qdm2: Whitespace cosmetics
  flac: use meaningful return values

Conflicts:
libavcodec/flacdec.c

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