Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 12:21:47 +0000 (14:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 12:22:26 +0000 (14:22 +0200)
commit7283d2bb90ab0b885ab2a53219123be3bca08010
tree93843835d1113f28488ef654c043537764147de6
parentb3970b39491ffab25a9c922f384855aca81d50b2
parent85e8192b8593816c0445411a5bef5fc5363a9b6d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avpacket: Fix error checking in packet_alloc

Conflicts:
libavcodec/avpacket.c

See: b905a7137a51a9a4f66d75172897d1f38c0b292a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avpacket.c