diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
| commit | ad86ea038a0b4803c7e3f1a82a293e2ee538e345 (patch) | |
| tree | 24aa3f8a8900028189d268d75854049dfa386794 /src/libffmpeg/libavcodec/h264.c | |
| parent | 72ae3e51758986775949a7ba2002a526d359389f (diff) | |
| download | xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.gz xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.bz2 | |
big ffmpeg patch
* do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER,
which will only compile an I-frame-only MPEG1 encoder (speeds up compile time)
* fix a lot of warnings in ffmpeg (a good deal of which have already been
submitted to the ffmpeg project by Mike)
* simplify some Makefiles
CVS patchset: 5667
CVS date: 2003/11/01 18:12:53
Diffstat (limited to 'src/libffmpeg/libavcodec/h264.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/h264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/h264.c b/src/libffmpeg/libavcodec/h264.c index 97589ce82..26aeb8296 100644 --- a/src/libffmpeg/libavcodec/h264.c +++ b/src/libffmpeg/libavcodec/h264.c @@ -2919,9 +2919,11 @@ static int decode_slice_header(H264Context *h){ h->max_pic_num= 1<<(h->sps.log2_max_frame_num + 1); } +#if 0 if(h->nal_unit_type == NAL_IDR_SLICE){ get_ue_golomb(&s->gb); /* idr_pic_id */ } +#endif if(h->sps.poc_type==0){ h->poc_lsb= get_bits(&s->gb, h->sps.log2_max_poc_lsb); @@ -2982,12 +2984,14 @@ static int decode_slice_header(H264Context *h){ s->qscale = h->pps.init_qp + get_se_golomb(&s->gb); //slice_qp_delta //FIXME qscale / qp ... stuff +#if 0 if(h->slice_type == SP_TYPE){ get_bits1(&s->gb); /* sp_for_switch_flag */ } if(h->slice_type==SP_TYPE || h->slice_type == SI_TYPE){ get_se_golomb(&s->gb); /* slice_qs_delta */ } +#endif if( h->pps.deblocking_filter_parameters_present ) { h->disable_deblocking_filter_idc= get_ue_golomb(&s->gb); |