OSDN Git Service

Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 14:12:21 +0000 (15:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 14:38:13 +0000 (15:38 +0100)
commite066fb54cb6fbc52cd95640ec0e81222750bb329
tree10b36b6c0476ced3104b0e2d6911a77dceb4b648
parentaef816f957eec100da42bcbf65e3bfe86df679fa
parentaa3c77998404cc32233cb76e961ca27db8565459
Merge commit 'aa3c77998404cc32233cb76e961ca27db8565459'

* commit 'aa3c77998404cc32233cb76e961ca27db8565459':
  lavf: sanity check size in av_get/append_packet().

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c