Michael Niedermayer 39a69d9dfb Merge commit '0f51c398beac87682b2249662b97e30512f7868c' ...

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

Conflicts:
	libavformat/http.c
See: b09d86c636
See: 6bab3430a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-07-29 12:00:17 +02:00

36 KiB

Raw Blame History

View Raw