diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 21:43:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 21:43:56 +0200 |
| commit | a1ac27bc6639792c5ace89add806fd6966e1a84f (patch) | |
| tree | 3cdfa8c6ab3450b66014724e3e1058bbadfed0f1 /tools/zmqsend.c | |
| parent | 554a1ecab7efbdaf10ab459d73152bfb6e355dfa (diff) | |
| parent | 7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb (diff) | |
| download | ffmpeg-a1ac27bc6639792c5ace89add806fd6966e1a84f.tar.gz | |
Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb'
* commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb':
librtmp: Map native options to librtmp ones when possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/zmqsend.c')
0 files changed, 0 insertions, 0 deletions