diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 11:26:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 11:26:31 +0100 |
| commit | aed58f6aae0c00a0df5ef31ec3362f47ce773f62 (patch) | |
| tree | 384ea3e666a7c57bbcf6b158936b2eb7b6e5a78b /libswresample/swresample-test.c | |
| parent | f3c9d8d41bca254aab993d5f783297fde0c802ae (diff) | |
| parent | 92e354b655613b88c3c202a7e19e7037daed37eb (diff) | |
| download | ffmpeg-aed58f6aae0c00a0df5ef31ec3362f47ce773f62.tar.gz | |
Merge commit '92e354b655613b88c3c202a7e19e7037daed37eb'
* commit '92e354b655613b88c3c202a7e19e7037daed37eb':
rtpdec_vp8: Set the timestamp when returning a deferred packet
hlsenc: Make the start_number option set the right variable
Conflicts:
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample-test.c')
0 files changed, 0 insertions, 0 deletions