[FFmpeg-cvslog] Merge commit '0f51c398beac87682b2249662b97e30512f7868c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 11:57:30 2013 +0200| [39a69d9dfbc7d527018546d7a1a1be99d82dceeb] | committer: Michael Niedermayer

Merge commit '0f51c398beac87682b2249662b97e30512f7868c'

* commit '0f51c398beac87682b2249662b97e30512f7868c':
  http: Support reading gzip/deflate compressed data
  utvideoenc: use av_image_copy_plane()

Conflicts:
	libavformat/http.c
See: b09d86c6366f2933d7bec430486d9d56bf98f7b6
See: 6bab3430a775183f2f9acbd91d1376c71e87c026
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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