Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 09:45:21 +0000 (11:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 09:45:37 +0000 (11:45 +0200)
* commit '06ebc0bf9a6401733a4ce1310325de19f631819a':
  lavf: Allocate arrays with av_realloc if they will be realloced later

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/concat.c
libavformat/rtpdec_qt.c

Simple merge
Simple merge