Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
daf2c35f
Commit
daf2c35f
authored
Aug 11, 2015
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Remove newline from avpriv_request_sample() calls.
parent
f0708b75
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
c93.c
libavcodec/c93.c
+1
-1
dvbsubdec.c
libavcodec/dvbsubdec.c
+1
-1
jpeg2000dec.c
libavcodec/jpeg2000dec.c
+4
-4
lcldec.c
libavcodec/lcldec.c
+2
-2
mjpegdec.c
libavcodec/mjpegdec.c
+1
-1
xan.c
libavcodec/xan.c
+1
-1
No files found.
libavcodec/c93.c
View file @
daf2c35f
...
@@ -182,7 +182,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
...
@@ -182,7 +182,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
int
from_y
=
offset
/
WIDTH
;
int
from_y
=
offset
/
WIDTH
;
if
(
block_type
==
C93_4X4_FROM_CURR
&&
from_y
==
y
+
j
&&
if
(
block_type
==
C93_4X4_FROM_CURR
&&
from_y
==
y
+
j
&&
(
FFABS
(
from_x
-
x
-
i
)
<
4
||
FFABS
(
from_x
-
x
-
i
)
>
WIDTH
-
4
))
{
(
FFABS
(
from_x
-
x
-
i
)
<
4
||
FFABS
(
from_x
-
x
-
i
)
>
WIDTH
-
4
))
{
avpriv_request_sample
(
avctx
,
"block overlap %d %d %d %d
\n
"
,
from_x
,
x
+
i
,
from_y
,
y
+
j
);
avpriv_request_sample
(
avctx
,
"block overlap %d %d %d %d"
,
from_x
,
x
+
i
,
from_y
,
y
+
j
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
if
((
ret
=
copy_block
(
avctx
,
&
out
[
j
*
stride
+
i
],
if
((
ret
=
copy_block
(
avctx
,
&
out
[
j
*
stride
+
i
],
...
...
libavcodec/dvbsubdec.c
View file @
daf2c35f
...
@@ -839,7 +839,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou
...
@@ -839,7 +839,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou
/* Not touching AVSubtitles again*/
/* Not touching AVSubtitles again*/
if
(
sub
->
num_rects
)
{
if
(
sub
->
num_rects
)
{
avpriv_request_sample
(
ctx
,
"Different Version of Segment asked Twice
\n
"
);
avpriv_request_sample
(
ctx
,
"Different Version of Segment asked Twice"
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
for
(
display
=
ctx
->
display_list
;
display
;
display
=
display
->
next
)
{
for
(
display
=
ctx
->
display_list
;
display
;
display
=
display
->
next
)
{
...
...
libavcodec/jpeg2000dec.c
View file @
daf2c35f
...
@@ -658,13 +658,13 @@ static int get_poc(Jpeg2000DecoderContext *s, int size, Jpeg2000POC *p)
...
@@ -658,13 +658,13 @@ static int get_poc(Jpeg2000DecoderContext *s, int size, Jpeg2000POC *p)
}
}
if
(
elem_size
>
7
)
{
if
(
elem_size
>
7
)
{
avpriv_request_sample
(
s
->
avctx
,
"Fat POC not supported
\n
"
);
avpriv_request_sample
(
s
->
avctx
,
"Fat POC not supported"
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
tmp
.
nb_poc
=
(
size
-
2
)
/
elem_size
;
tmp
.
nb_poc
=
(
size
-
2
)
/
elem_size
;
if
(
tmp
.
nb_poc
>
MAX_POCS
)
{
if
(
tmp
.
nb_poc
>
MAX_POCS
)
{
avpriv_request_sample
(
s
->
avctx
,
"Too many POCs (%d)
\n
"
,
tmp
.
nb_poc
);
avpriv_request_sample
(
s
->
avctx
,
"Too many POCs (%d)"
,
tmp
.
nb_poc
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
...
@@ -951,14 +951,14 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
...
@@ -951,14 +951,14 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
return
newpasses
;
return
newpasses
;
av_assert2
(
newpasses
>
0
);
av_assert2
(
newpasses
>
0
);
if
(
cblk
->
npasses
+
newpasses
>=
JPEG2000_MAX_PASSES
)
{
if
(
cblk
->
npasses
+
newpasses
>=
JPEG2000_MAX_PASSES
)
{
avpriv_request_sample
(
s
->
avctx
,
"Too many passes
\n
"
);
avpriv_request_sample
(
s
->
avctx
,
"Too many passes"
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
if
((
llen
=
getlblockinc
(
s
))
<
0
)
if
((
llen
=
getlblockinc
(
s
))
<
0
)
return
llen
;
return
llen
;
if
(
cblk
->
lblock
+
llen
+
av_log2
(
newpasses
)
>
16
)
{
if
(
cblk
->
lblock
+
llen
+
av_log2
(
newpasses
)
>
16
)
{
avpriv_request_sample
(
s
->
avctx
,
avpriv_request_sample
(
s
->
avctx
,
"Block with length beyond 16 bits
\n
"
);
"Block with length beyond 16 bits"
);
return
AVERROR_PATCHWELCOME
;
return
AVERROR_PATCHWELCOME
;
}
}
...
...
libavcodec/lcldec.c
View file @
daf2c35f
...
@@ -512,7 +512,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
...
@@ -512,7 +512,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV422P
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV422P
;
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Image type is YUV 4:2:2.
\n
"
);
av_log
(
avctx
,
AV_LOG_DEBUG
,
"Image type is YUV 4:2:2.
\n
"
);
if
(
avctx
->
width
%
4
)
{
if
(
avctx
->
width
%
4
)
{
avpriv_request_sample
(
avctx
,
"Unsupported dimensions
\n
"
);
avpriv_request_sample
(
avctx
,
"Unsupported dimensions"
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
break
;
break
;
...
@@ -547,7 +547,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
...
@@ -547,7 +547,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
av_pix_fmt_get_chroma_sub_sample
(
avctx
->
pix_fmt
,
&
subsample_h
,
&
subsample_v
);
av_pix_fmt_get_chroma_sub_sample
(
avctx
->
pix_fmt
,
&
subsample_h
,
&
subsample_v
);
if
(
avctx
->
width
%
(
1
<<
subsample_h
)
||
avctx
->
height
%
(
1
<<
subsample_v
))
{
if
(
avctx
->
width
%
(
1
<<
subsample_h
)
||
avctx
->
height
%
(
1
<<
subsample_v
))
{
avpriv_request_sample
(
avctx
,
"Unsupported dimensions
\n
"
);
avpriv_request_sample
(
avctx
,
"Unsupported dimensions"
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
...
...
libavcodec/mjpegdec.c
View file @
daf2c35f
...
@@ -289,7 +289,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
...
@@ -289,7 +289,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
width
=
get_bits
(
&
s
->
gb
,
16
);
width
=
get_bits
(
&
s
->
gb
,
16
);
if
(
s
->
avctx
->
codec_id
==
AV_CODEC_ID_AMV
&&
(
height
&
15
))
if
(
s
->
avctx
->
codec_id
==
AV_CODEC_ID_AMV
&&
(
height
&
15
))
avpriv_request_sample
(
s
->
avctx
,
"non mod 16 height AMV
\n
"
);
avpriv_request_sample
(
s
->
avctx
,
"non mod 16 height AMV"
);
// HACK for odd_height.mov
// HACK for odd_height.mov
if
(
s
->
interlaced
&&
s
->
width
==
width
&&
s
->
height
==
height
+
1
)
if
(
s
->
interlaced
&&
s
->
width
==
width
&&
s
->
height
==
height
+
1
)
...
...
libavcodec/xan.c
View file @
daf2c35f
...
@@ -263,7 +263,7 @@ static inline void xan_wc3_copy_pixel_run(XanContext *s, AVFrame *frame,
...
@@ -263,7 +263,7 @@ static inline void xan_wc3_copy_pixel_run(XanContext *s, AVFrame *frame,
prevframe_x
=
x
+
motion_x
;
prevframe_x
=
x
+
motion_x
;
if
(
prev_palette_plane
==
palette_plane
&&
FFABS
(
curframe_index
-
prevframe_index
)
<
pixel_count
)
{
if
(
prev_palette_plane
==
palette_plane
&&
FFABS
(
curframe_index
-
prevframe_index
)
<
pixel_count
)
{
avpriv_request_sample
(
s
->
avctx
,
"Overlapping copy
\n
"
);
avpriv_request_sample
(
s
->
avctx
,
"Overlapping copy"
);
return
;
return
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment