Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 10:13:41 +0000 (12:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 10:13:41 +0000 (12:13 +0200)
commit72eddc10fa1f3ca7fb95292673fa26401f754c92
tree878039cdab1f882bc68a9e60203e430d42eb8d54
parent328a5b93d3a493d6a653a83c425fb2cc98e8f41b
parentd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9
Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9':
  lavf: Reset the entry count and allocation size variables on av_reallocp failures

Conflicts:
libavformat/avienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavformat/avidec.c
libavformat/avienc.c
libavformat/aviobuf.c
libavformat/mmst.c
libavformat/oggparsetheora.c
libavformat/oggparsevorbis.c
libavformat/rdt.c
libavformat/rtmphttp.c
libavformat/rtmpproto.c
libavformat/rtpdec_qt.c
libavformat/smacker.c
libavformat/smoothstreamingenc.c