Michael Niedermayer 29707f5ba6 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>

2012-12-21 14:06:42 +01:00

8.6 KiB

Raw Blame History

View Raw