diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 11:57:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 12:00:17 +0200 |
| commit | 39a69d9dfbc7d527018546d7a1a1be99d82dceeb (patch) | |
| tree | 4a5d975ff949fba5b0608302efc74d5bf5657bb1 /libavcodec/xl.c | |
| parent | 0c6f382e855749ec45224a74ba5e07d1db52e6a0 (diff) | |
| parent | 0f51c398beac87682b2249662b97e30512f7868c (diff) | |
| download | ffmpeg-39a69d9dfbc7d527018546d7a1a1be99d82dceeb.tar.gz | |
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>
Diffstat (limited to 'libavcodec/xl.c')
0 files changed, 0 insertions, 0 deletions