virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'

Browse Source 
* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-02 18:31:41 +01:00
commit 1654e64bba
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpeg4video_parser.c
View File

@ -34,7 +34,8 @@ struct Mp4vParseContext {
int first_picture;
};
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size)
{
int vop_found, i;
uint32_t state;
@ -91,7 +92,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
init_get_bits(gb, buf, 8 * buf_size);
ret = ff_mpeg4_decode_picture_header(s, gb);
if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) {
if (s->width && (!avctx->width || !avctx->height ||
!avctx->coded_width || !avctx->coded_height)) {
ret = ff_set_dimensions(avctx, s->width, s->height);
if (ret < 0)
return ret;
@ -147,7 +149,6 @@ static int mpeg4video_parse(AVCodecParserContext *s,
return next;
}
AVCodecParser ff_mpeg4video_parser = {
.codec_ids = { AV_CODEC_ID_MPEG4 },
.priv_data_size = sizeof(struct Mp4vParseContext),