Merge commit 'a925f723a915bc0255e2673f8817af5212131763'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 13:06:42 +0000 (14:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 13:06:42 +0000 (14:06 +0100)
commit29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1
tree9e2f5bf57e25ccc89adbf2a882f8d4d055a4230f
parent63753186cc2766e01c6a46d06895a7742c1a768f
parenta925f723a915bc0255e2673f8817af5212131763
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>
libavformat/flvenc.c
libavformat/rtp.c
libavformat/sapenc.c