Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Apr 2012 18:45:06 +0000 (20:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Apr 2012 18:45:06 +0000 (20:45 +0200)
commit9d7c1b4cf36737bde226d0f7bb4e271e61e4e8a6
tree07577504efcb323108e1fcb6d76499a863386589
parentc31be45e144a5f4748c9b9d5b8802f254550a471
parent9b9df1cdff149db5bbe6726b236934c5b5fbe21d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: new assembly version of get_cabac for x86_64 with PIC
  h264: use one table instead of several for cabac functions
  h264: (trivial) remove unneeded macro argument in x86/cabac.h
  libschroedingerdec: check malloc
  segment: reorder seg_write_header allocation
  avio: make avio_close(NULL) a no-op
  mov: Parse EC3SpecificBox (dec3 atom).

Conflicts:
libavcodec/cabac.c
libavcodec/x86/cabac.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libschroedingerdec.c
libavformat/aviobuf.c
libavformat/mov.c
libavformat/segment.c