[FFmpeg-cvslog] Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 30 14:49:13 2012 +0100| [db29a7c7c2822a2f2e9804988e279a9fe7d88c11] | committer: Michael Niedermayer

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 at gmx.at>

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