← Back to branch summary

~ubuntu-branches/debian/squeeze/gstreamer0.10-ffmpeg/squeeze

« back to all changes in this revision

Viewing changes to gst-libs/ext/ffmpeg/libavcodec/golomb.h

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-02-19 18:14:59 UTC
  • mfrom: (4.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20100219181459-mect96st3px2jfsi
Tags: 0.10.9.2-1
* New upstream pre-release:
  + debian/patches/03_restricted-caps.patch,
    debian/patches/04_ignore-vdpau.patch:
    - Dropped, merged upstream.
* debian/patches/03_too-new-codec-ids.patch:
  + Disable some ffmpeg codec IDs because Debian's
    ffmpeg is once again too old...

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/ffmpeg/libavcodec/golomb.h
31
31
#define AVCODEC_GOLOMB_H
32
32
 
33
33
#include <stdint.h>
34
 
#include "bitstream.h"
 
34
#include "get_bits.h"
 
35
#include "put_bits.h"
35
36
 
36
37
#define INVALID_VLC           0x80000000
37
38
 
252
253
 
253
254
        return buf;
254
255
    }else{
255
 
        buf >>= 32 - limit - esc_len;
256
 
        LAST_SKIP_BITS(re, gb, esc_len + limit);
 
256
        LAST_SKIP_BITS(re, gb, limit);
 
257
        UPDATE_CACHE(re, gb);
 
258
 
 
259
        buf = SHOW_UBITS(re, gb, esc_len);
 
260
 
 
261
        LAST_SKIP_BITS(re, gb, esc_len);
257
262
        CLOSE_READER(re, gb);
258
263
 
259
264
        return buf + limit - 1;