diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 14:06:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 14:06:42 +0100 |
| commit | 29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1 (patch) | |
| tree | 9e2f5bf57e25ccc89adbf2a882f8d4d055a4230f /libavformat/mov_chan.h | |
| parent | 63753186cc2766e01c6a46d06895a7742c1a768f (diff) | |
| parent | a925f723a915bc0255e2673f8817af5212131763 (diff) | |
| download | ffmpeg-29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1.tar.gz | |
Merge commit 'a925f723a915bc0255e2673f8817af5212131763'
* commit 'a925f723a915bc0255e2673f8817af5212131763':
rtp: Don't read priv_data unless it is allocated
flvenc: Check whether seeking back to the header succeeded
sapenc: Pass the title on to the chained muxers
Conflicts:
libavformat/flvenc.c
libavformat/sapenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov_chan.h')
0 files changed, 0 insertions, 0 deletions