Merge commit '0f51c398beac87682b2249662b97e30512f7868c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 09:57:30 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:00:17 +0000 (12:00 +0200)
commit39a69d9dfbc7d527018546d7a1a1be99d82dceeb
tree4a5d975ff949fba5b0608302efc74d5bf5657bb1
parent0c6f382e855749ec45224a74ba5e07d1db52e6a0
parent0f51c398beac87682b2249662b97e30512f7868c
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@gmx.at>
libavformat/http.c