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)
* 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>
1  2 
libavformat/flvenc.c
libavformat/rtp.c
libavformat/sapenc.c

Simple merge
Simple merge
  #include "libavutil/parseutils.h"
  #include "libavutil/random_seed.h"
  #include "libavutil/avstring.h"
+ #include "libavutil/dict.h"
  #include "libavutil/intreadwrite.h"
  #include "libavutil/time.h"
 +#include "libavutil/dict.h"
  #include "internal.h"
  #include "network.h"
  #include "os_support.h"