diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 14:04:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 14:05:59 +0200 |
| commit | c02945b6d27af0e277434780c01bae8d40f5fd24 (patch) | |
| tree | 539895ca8a9a27248985fa1223bf59aa37066bec /libavcodec/rv34dsp.c | |
| parent | 50c0837801b21870fbd14327e4120309e454b258 (diff) | |
| parent | 9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a (diff) | |
| download | ffmpeg-c02945b6d27af0e277434780c01bae8d40f5fd24.tar.gz | |
Merge commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a'
* commit '9d86bfc259ae9ba7a76067ec931ff20fbb86ea2a':
hlsenc: Don't reset the number variable when wrapping
Conflicts:
libavformat/hlsenc.c
See: 75b9fb27f516f9db7995ab2c2abb83e25cae5813
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv34dsp.c')
0 files changed, 0 insertions, 0 deletions