Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Mar 2013 11:15:14 +0000 (12:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Mar 2013 11:15:14 +0000 (12:15 +0100)
commit992957ac30501b5d05b85fed8da65acfbc067365
tree826f455d644e99ec578fe385ed95f0f951ada5b8
parentb3c8fd1f0e48ab6cd3c7c0e3f36d55152de623ec
parenta3b3096772c65899d7ca43a913051420d706c88a
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  update Changelog
  h264: set ref_count to 0 for intra slices.
  h264: on reference overflow, reset the reference count to 0, not 1.
  flvdec: Check the return value of a malloc

Conflicts:
Changelog
libavcodec/h264.c
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/h264.c
libavformat/flvdec.c