diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:25:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 14:26:15 +0200 |
| commit | 58b5b062b84b09dfa49bf84497eb530da3918abf (patch) | |
| tree | 0aefa5796f62a7bd8854d8e3e3ff3d2aee9b2e21 /libavformat/httpauth.c | |
| parent | 5ac46a0969a3c86422794c838b681c75fda6b25e (diff) | |
| parent | 051ac5c0f51c119b33a57f3e137d7344eb1c2b26 (diff) | |
| download | ffmpeg-58b5b062b84b09dfa49bf84497eb530da3918abf.tar.gz | |
Merge commit '051ac5c0f51c119b33a57f3e137d7344eb1c2b26' into release/2.2
* commit '051ac5c0f51c119b33a57f3e137d7344eb1c2b26':
mpegvideo: Use the current_picture pts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/httpauth.c')
0 files changed, 0 insertions, 0 deletions