Paul B Mahol
19da86f3ff
targaenc: remove unused TargaContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:42:40 +00:00
Paul B Mahol
e999f2339a
truemotion2: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:42:40 +00:00
Paul B Mahol
a5155294e5
pnm: do not set avctx->coded_frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:27:36 +00:00
Paul B Mahol
329221eee7
pnm: fix 255 < maxval < 65535 for pam with depth 1
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28 22:27:36 +00:00
Carl Eugen Hoyos
2c046c718a
Revert "Avoid overflows when reading pgm files with maxval != 255 and != 65535."
...
The patch worked on little endian because pgm decoding was broken
but it was not correct in any way.
This reverts commit 7651c0e49b
.
2013-07-29 00:05:43 +02:00
Paul B Mahol
768e40b451
Revert "pnm: remove nonsense code"
...
Breaks decoding pgms with 256 < maxval < 65535.
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>.
This reverts commit a0348d0966
.
2013-07-28 21:45:37 +00:00
Carl Eugen Hoyos
7651c0e49b
Avoid overflows when reading pgm files with maxval != 255 and != 65535.
...
libjpeg v6b apparently does not initialize the most significant bits
to zero when writing 12bit pgm's with maxval 4095.
2013-07-28 19:07:06 +02:00
Carl Eugen Hoyos
7e8e8ba9cc
Assume gray8 if 1 < maxval <= 255 in pgm.
2013-07-28 18:12:23 +02:00
Carl Eugen Hoyos
ae4dc0b37a
Set bits_per_raw_sample when decoding mjpeg / ljpeg.
...
The ljpeg decoder also supports gray images with
8 - 15 bits per component.
2013-07-28 17:13:01 +02:00
Michael Niedermayer
b0edd59994
Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
...
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
Add missing deprecation attributes
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 13:44:34 +02:00
Michael Niedermayer
102397d2c1
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
...
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
h264: K&R formatting cosmetics
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 11:40:49 +02:00
Marton Balint
63c0113588
lavc: do not override format if neither text nor bitmap codec prop is set
...
Some decoders may output both, this way the decoder can set it.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 23:03:00 +02:00
Paul B Mahol
94ad38e2e8
dpx: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:51:14 +00:00
Paul B Mahol
6a57494204
dpxenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:45:48 +00:00
Paul B Mahol
9d099b9ae4
targa_y216dec: remove empty function
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:27:15 +00:00
Paul B Mahol
0909f3edbd
zmbv: return meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:21:33 +00:00
Paul B Mahol
60a7fac61b
utvideoenc: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:07:48 +00:00
Tim.Nicholson
84e345b38e
Forward interlaced field information from mov to v210 decoder.
...
Reported and tested by Dave Rice.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-07-27 18:57:28 +02:00
Diego Biurrun
bf4b0ed1d5
Add missing deprecation attributes
2013-07-27 16:08:49 +02:00
Michael Niedermayer
3adf054b22
avcodec/vorbisenc: change 6 asserts to av_asserts()
...
speed relevant ones use av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Michael Niedermayer
5e763920a4
avcodec/mpegvideo: update disabled assert() to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Paul B Mahol
88b071a473
exr: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:19 +00:00
Paul B Mahol
d9954ccff0
targa: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
3ea5d01a12
escape130: make "chroma_vals" static
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
6dbcecd78e
lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
...
Also check return value.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
573018c61f
lclenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
86e722ab97
sgidec: safer check for buffer overflow
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
997e2b59e3
sgidec: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
5efa5103b0
sgidec: simplify return path
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Diego Biurrun
16c22122c7
h264: K&R formatting cosmetics
2013-07-27 10:47:38 +02:00
Michael Niedermayer
205f423e28
libavcodec/mpegvideo: change some asserts to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:55 +02:00
Michael Niedermayer
c88bbc01eb
avcodec/mpegvideo: replace assert about interlaced EC by debug av_log()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:47 +02:00
Paul B Mahol
1fa0284c57
qcelpdec: change asserts to av_asserts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:32:27 +00:00
Paul B Mahol
fdf9296df7
sgienc: remove unused SgiContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:21:44 +00:00
Paul B Mahol
2868035d95
pcxenc: get rid of unused PCXContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 14:00:40 +00:00
Paul B Mahol
3838637bbb
yop: check return value of av_frame_alloc()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:51:26 +00:00
Paul B Mahol
9437259276
vmnc: check return values of reallocation
...
Also avoid memory leaks.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:49:36 +00:00
Paul B Mahol
cf5ab8b6f7
vmnc: make code independent of sizeof(AVFrame)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 13:39:40 +00:00
Michael Niedermayer
46ad2d9e44
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 11:12:11 +02:00
Michael Niedermayer
5dc2c99055
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
...
* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
mpeg12: Ignore slice threading if hwaccel is active
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:57:51 +02:00
Michael Niedermayer
bbc7d33a0d
Merge commit '582963a8156522582e55466be4a59974a8d909a5'
...
* commit '582963a8156522582e55466be4a59974a8d909a5':
vdpau: Fix VC-1 interlaced mode
Conflicts:
libavcodec/vdpau_vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:51:42 +02:00
Michael Niedermayer
af7949fdea
Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'
...
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
cosmetics: Add '0' to float constants ending in '.'.
Conflicts:
libavcodec/ra288.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:43:12 +02:00
Michael Niedermayer
e28fabb4cb
Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'
...
* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
twinvq: K&R formatting cosmetics
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:30:47 +02:00
Diego Biurrun
03039f4c8c
miscellaneous typo fixes
2013-07-25 19:43:32 +02:00
Rémi Denis-Courmont
93a51984a2
mpeg12: Ignore slice threading if hwaccel is active
...
Slice threading does not work with hardware acceleration, as decoding
is per-picture. This fixes Bugzilla #542 .
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-25 19:43:32 +02:00
Carl Eugen Hoyos
9375879d57
Show max bitrate for mpeg2 video streams in avcodec_string().
...
See also 25b7aa9
2013-07-25 19:08:19 +02:00
Rainer Hochecker
582963a815
vdpau: Fix VC-1 interlaced mode
...
VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-25 14:19:17 +02:00
Diego Biurrun
4a2ef39442
cosmetics: Add '0' to float constants ending in '.'.
2013-07-25 11:33:23 +02:00
Diego Biurrun
6c145ecf78
twinvq: K&R formatting cosmetics
2013-07-25 11:17:06 +02:00
Michael Niedermayer
0815b23062
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: Comment out unused labels in simple_idct_arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-25 10:15:08 +02:00