Skip to content
Snippets Groups Projects
Commit c4079844 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge remote branch 'qatar/master'


* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad6.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents c9678600 fd0c3403
No related branches found
No related tags found
No related merge requests found
Showing
with 195 additions and 78 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment