[FFmpeg-cvslog] Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 11:34:07 2013 +0200| [5f312139dff4072c3482a0b01daafcc1446d70c8] | committer: Michael Niedermayer

Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c'

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

Conflicts:
	libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f312139dff4072c3482a0b01daafcc1446d70c8
---