diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-05 05:03:12 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-05 05:03:12 +0400 |
| commit | 7f83db312454b3673a4dfd34745428f61309ab30 (patch) | |
| tree | 27c92b052b83e4b3bf95a33fbe6979aaa00f8184 /libavcodec/bytestream.h | |
| parent | c4eec85a1fa768025f88261995af08f1dba9685d (diff) | |
| parent | feb15cee5e19a1e31d075ec08d598d64c2dc38ef (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (46 commits)
mtv: Make sure audio_subsegments is not 0
v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined
avconv: add symbolic names for -vsync parameters
flvdec: Fix compiler warning for uninitialized variables
rtsp: Fix compiler warning for uninitialized variable
ulti: convert to new bytestream API.
swscale: Use standard multiple inclusion guards in ppc/ header files.
Place some START_TIMER invocations in separate blocks.
v4l2: list available formats
v4l2: set the proper codec_tag
v4l2: refactor device_open
v4l2: simplify away io_method
v4l2: cosmetics
v4l2: uniform and format options
v4l2: do not force interlaced mode
avio: exit early in fill_buffer without read_packet
vc1dec: fix invalid memory access for small video dimensions
rv34: fix invalid memory access for small video dimensions
rv34: joint coefficient decoding and dequantization
avplay: Don't call avio_set_interrupt_cb(NULL)
...
Conflicts:
Changelog
avconv.c
doc/APIchanges
doc/indevs.texi
libavcodec/adxenc.c
libavcodec/dnxhdenc.c
libavcodec/h264.c
libavdevice/v4l2.c
libavformat/flvdec.c
libavformat/mtv.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bytestream.h')
| -rw-r--r-- | libavcodec/bytestream.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h index 7ca36f8ad3..73ea0c880f 100644 --- a/libavcodec/bytestream.h +++ b/libavcodec/bytestream.h @@ -39,11 +39,15 @@ static av_always_inline void bytestream_put_ ##name(uint8_t **b, const type valu write(*b, value);\ (*b) += bytes;\ }\ +static av_always_inline type bytestream2_get_ ## name ## u(GetByteContext *g)\ +{\ + return bytestream_get_ ## name(&g->buffer);\ +}\ static av_always_inline type bytestream2_get_ ## name(GetByteContext *g)\ {\ if (g->buffer_end - g->buffer < bytes)\ return 0;\ - return bytestream_get_ ## name(&g->buffer);\ + return bytestream2_get_ ## name ## u(g);\ }\ static av_always_inline type bytestream2_peek_ ## name(GetByteContext *g)\ {\ |