diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-05-09 00:25:49 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-05-09 00:25:49 +0000 |
| commit | 1cc910726e54d912f7aaa8e9b8bf2cbfb4c16fff (patch) | |
| tree | e4a1118306b795a660107d1ffb625734a62ed37b /src/libffmpeg/libavcodec/h264.c | |
| parent | 4b55f2a805638a3d817a6df37c5540243887274a (diff) | |
| download | xine-lib-1cc910726e54d912f7aaa8e9b8bf2cbfb4c16fff.tar.gz xine-lib-1cc910726e54d912f7aaa8e9b8bf2cbfb4c16fff.tar.bz2 | |
routine ffmpeg tree sync; also, remove motion_est.c and ratecontrol.c
from the Makefile
CVS patchset: 4803
CVS date: 2003/05/09 00:25:49
Diffstat (limited to 'src/libffmpeg/libavcodec/h264.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/h264.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/h264.c b/src/libffmpeg/libavcodec/h264.c index 31cb74963..5acce0d83 100644 --- a/src/libffmpeg/libavcodec/h264.c +++ b/src/libffmpeg/libavcodec/h264.c @@ -3868,6 +3868,7 @@ fprintf(stderr, "FMO not supported\n"); |) | | | | slice_group_id[ i ] |1 |u(v) | #endif + break; } } pps->ref_count[0]= get_ue_golomb(&s->gb) + 1; @@ -3942,7 +3943,7 @@ static int find_frame_end(MpegEncContext *s, uint8_t *buf, int buf_size){ } pc->state= state; - return -1; + return END_NOT_FOUND; } static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ @@ -4366,6 +4367,6 @@ AVCodec h264_decoder = { NULL, decode_end, decode_frame, - /*CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | */CODEC_CAP_TRUNCATED, + /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED, }; |