← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-updates

« back to all changes in this revision

Viewing changes to libavcodec/tta.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 17:51:19 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120175119-gu6kw1arv5tmf1vr
Tags: 3:0.svn20090119-1ubuntu1+unstripped1
https://launchpad.net/bugs/303537
* merge with the ubuntu.jaunty branch
* reenable x264 LP: #303537
* build against vdpau
* enable xvmc support

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/tta.c
209
209
        return -1;
210
210
 
211
211
    init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size);
212
 
    if (show_bits_long(&s->gb, 32) == ff_get_fourcc("TTA1"))
 
212
    if (show_bits_long(&s->gb, 32) == AV_RL32("TTA1"))
213
213
    {
214
214
        /* signature */
215
215
        skip_bits(&s->gb, 32);
216
 
//        if (get_bits_long(&s->gb, 32) != bswap_32(ff_get_fourcc("TTA1"))) {
 
216
//        if (get_bits_long(&s->gb, 32) != bswap_32(AV_RL32("TTA1"))) {
217
217
//            av_log(s->avctx, AV_LOG_ERROR, "Missing magic\n");
218
218
//            return -1;
219
219
//        }