diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-10 23:35:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-11 00:39:01 +0200 |
| commit | ae17a0c25873bd39c048c176dca2372f565276d9 (patch) | |
| tree | c37cf84af10547282f03dc6ed495622903e15226 /libavcodec/rv34_parser.c | |
| parent | 937aac4f978c79ebdb2ae940b64a0f5cdb534d68 (diff) | |
| parent | 1d4579e38ecad578c86516fad2837a273d11b320 (diff) | |
| download | ffmpeg-ae17a0c25873bd39c048c176dca2372f565276d9.tar.gz | |
Merge commit '1d4579e38ecad578c86516fad2837a273d11b320'
* commit '1d4579e38ecad578c86516fad2837a273d11b320':
tcp: Add AVOption support
Conflicts:
libavformat/tcp.c
See: 2e009c6042bde419599ebed9165e597bbef23b2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34_parser.c')
0 files changed, 0 insertions, 0 deletions