Michael Niedermayer db29a7c7c2 Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320' ...

* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
  build: The FLAC encoder also depends on the flacdsp code
  img2: K&R formatting cosmetics
  h264: check context state before decoding slice data partitions
  flashsv: make sure data for zlib priming is available

Conflicts:
	libavcodec/Makefile
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c

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

2012-11-30 14:49:13 +01:00

48 KiB

Raw Blame History

View Raw