diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 14:13:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 14:13:20 +0100 |
| commit | 131b9c924d6df2b52ca5821a13ddf6fdb49fe76c (patch) | |
| tree | 9dfba94c2fb8f998a75b9bba1f2338681b333ef1 /libavformat/hlsenc.c | |
| parent | 0a707da37b4101730debda1a5600022bbb0b736e (diff) | |
| parent | 68f930d2188aba5b32624887dcbf688c23482834 (diff) | |
| download | ffmpeg-131b9c924d6df2b52ca5821a13ddf6fdb49fe76c.tar.gz | |
Merge commit '68f930d2188aba5b32624887dcbf688c23482834'
* commit '68f930d2188aba5b32624887dcbf688c23482834':
h264: simplify calls to ff_er_add_slice().
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsenc.c')
0 files changed, 0 insertions, 0 deletions