Michael Niedermayer 5f312139df Merge commit '45ee556d51ef04d79d52bf6b0b7f28a4d231cb0c' ...

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

Conflicts:
	libavcodec/flacdec.c

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

2013-07-29 11:34:07 +02:00

7.7 KiB

Raw Blame History

View Raw