diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:45:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:45:42 +0200 |
| commit | 84f77f84234e409271852692e736900ee7b2f0fe (patch) | |
| tree | 8183ec61854cdc0a5dbc731aeca2ef73309b4ba7 /libavutil/pixdesc.c | |
| parent | 4a522eff006532f28c631f13a604c364102b7a6f (diff) | |
| parent | ec7c51c7868d3ccc66b5cc38bf126258b94f086c (diff) | |
| download | ffmpeg-84f77f84234e409271852692e736900ee7b2f0fe.tar.gz | |
Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
avf: move ff_http_match_no_proxy to network
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.c')
0 files changed, 0 insertions, 0 deletions