diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 21:52:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-02 21:53:14 +0100 |
| commit | bf691e1d39560532344e6df2e72f522cea6c9bea (patch) | |
| tree | 96fa25100ec77309ec57a5981cde0df1d5793a90 /libavformat/rtpenc_chain.h | |
| parent | 6cfd536675092489b9f384f8553ad97a96a10731 (diff) | |
| parent | 33d412eb4a2a083c1514ddbe69295b37e1918a8c (diff) | |
| download | ffmpeg-bf691e1d39560532344e6df2e72f522cea6c9bea.tar.gz | |
Merge commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c'
* commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c':
dashenc: Simplify code by using a local variable
Conflicts:
libavformat/dashenc.c
See: b86af8da3100a7eef3247747cd469b988f134e0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_chain.h')
0 files changed, 0 insertions, 0 deletions