[FFmpeg-cvslog] Merge commit 'a925f723a915bc0255e2673f8817af5212131763'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 21 14:06:42 2012 +0100| [29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29707f5ba6ff34b2ed89f3af0c00e1b3c01ac9b1
---