diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-20 00:47:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-20 01:29:30 +0100 |
| commit | be2e211dce2964f922e5dee54a7569ebd6efb0da (patch) | |
| tree | a1b6e3a9f5b577230d8c9c2b5b5bcba289ee79f5 /libavcodec/sunrast.c | |
| parent | f4f386dd00e594dc90eb32ae872ae8e22b08d179 (diff) | |
| parent | 6b8b0fe2bc57fdd606074e52ba73cd9b3d95e644 (diff) | |
| download | ffmpeg-be2e211dce2964f922e5dee54a7569ebd6efb0da.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxy: remove reference to removed api
examples: unbreak compilation
ttadec: cosmetics: reindent
sunrast: use RLE trigger macro inplace of the hard coded value.
sunrastenc: set keyframe flag for the output packet.
mpegvideo_enc: switch to encode2().
mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sunrast.c')
| -rw-r--r-- | libavcodec/sunrast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index cc7a9fb4e4..2dfa902ed0 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -165,7 +165,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, if (buf_end - buf < 1) return AVERROR_INVALIDDATA; - if ((value = *buf++) == 0x80) { + if ((value = *buf++) == RLE_TRIGGER) { run = *buf++ + 1; if (run != 1) value = *buf++; |