diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:03:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:03:52 +0100 |
| commit | d52bf89d21b744344cf6cda1bfe156786f24772a (patch) | |
| tree | 25cfd43e57273d606a09be92a020650f16f206c6 /libavformat/http.h | |
| parent | 99c76902cdc3f815d58ba16ccfc83e75acec1f4a (diff) | |
| parent | 78791c086bcaf9eb084c27555b31fea8bbb7624a (diff) | |
| download | ffmpeg-d52bf89d21b744344cf6cda1bfe156786f24772a.tar.gz | |
Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'
* commit '78791c086bcaf9eb084c27555b31fea8bbb7624a':
rtpdec: Use .init instead of .alloc to set default values
Conflicts:
libavformat/rdt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.h')
0 files changed, 0 insertions, 0 deletions