apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-29 02:50:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,192 Commits 7 Branches 0 Tags
9cb9e39c41959961bdb5a1fd51cdd25e10c050f3
Commit Graph

8374 Commits

Author SHA1 Message Date
Michael Niedermayer a6186f3a00 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: fix NULL reference in mov_write_tkhd_tag
  rmdec: Reject invalid deinterleaving parameters
  rv34: Fix potential overreads
  rv34: Fix buffer size used for MC of B frames after a resolution change
  rv34: Avoid NULL dereference on corrupted bitstream
  rv10: Reject slices that does not have the same type as the first one
  vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag
  vsrc_color: set output pos values to -1
  vsrc_color: add @file doxy
  vsrc_buffer: remove duplicated file description
  eval: implement not() expression
  eval: add sqrt function for computing the square root
  rmdec: use the deinterleaving mode and not the codec when creating audio packets.
  lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails

Conflicts:
	doc/eval.texi
	doc/filters.texi
	libavcodec/rv10.c
	libavfilter/vsrc_color.c
	libavformat/rmdec.c
	libavutil/avutil.h
	libavutil/eval.c
	tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-19 22:45:34 +02:00
Anton Khirnov c92a2a4eb8 movenc: fix NULL reference in mov_write_tkhd_tag 
st may be NULL when there are more mov streams than AVStreams, e.g. when
chapters are present.
 2011-09-19 16:44:42 +02:00
Laurent Aimar f06068bbd6 rmdec: Reject invalid deinterleaving parameters 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-19 15:45:22 +03:00
Laurent Aimar 3e033da847 rmdec: use the deinterleaving mode and not the codec when creating audio packets. 
It prevents crashes due to non initialized fields.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-19 12:37:31 +02:00
Carl Eugen Hoyos 4a9b069b67 Support 3IVD in isom, produced by 3ivx DivX Doctor. 
Fixes ticket #486.
 2011-09-19 12:20:42 +02:00
David Goldwich 63d64228a7 lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails 
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-19 12:03:56 +02:00
Joakim Plate 8e4c10003a Set AV_PKT_FLAG_KEY based on nupplevideo header 
Based from lipbmpdemux/nupplevideo.h and from myth NuppelVideoRecorder.cpp
 2011-09-18 18:25:44 +02:00
Joakim Plate 7768f6b1b9 add support for generic seeking by reading timestamps in nuv 2011-09-18 18:16:37 +02:00
Chiranjeevi Melam 07631deeee rtmpproto.c: Fixed RTMP Stream output issue 
Original code had the assumption of only one FLV packet per RTMP packet. But that assumption is incorrect for higher bit rates. Made changes to the code to accommodate more than one FLV packet per RTMP
+packet.
 2011-09-18 06:32:05 +02:00
Arne de Bruijn b2f230e23d mpegpsdec: fix reading first mpegps packet 2011-09-18 01:57:56 +02:00
Michael Niedermayer 9a9ceb8776 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: add select filter
  oggdec: fix out of bound write in the ogg demuxer
  movenc: create an alternate group for each media type
  lavd: add libcdio-paranoia input device for audio CD grabbing
  rawdec: refactor private option for raw video demuxers
  pcmdec: use unique classes for all pcm demuxers.
  rawdec: g722 is always 1 channel/16kHz

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavdevice/avdevice.h
	libavfilter/avfilter.h
	libavfilter/vf_select.c
	tests/ref/lavf/mov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 22:36:43 +02:00
Laurent Aimar 0e7efb9d23 oggdec: fix out of bound write in the ogg demuxer 
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-09-17 09:41:02 -07:00
Laurent Aimar 4907f81358 Reject audio tracks with invalid interleaver parameters in RM demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-17 18:26:53 +02:00
Anton Khirnov 7574cacbd5 movenc: create an alternate group for each media type 
Partially fixes bug 44.
 2011-09-17 08:42:30 +02:00
Anton Khirnov 85d982f1e2 rawdec: refactor private option for raw video demuxers 
pixel_format/video_size only apply to 'rawvideo' (==uncompressed) demuxer
and make no sense for the other raw (== containerless) demuxers. Keep
only the framerate option for those.

Also use unique classes for all raw video demuxers
 2011-09-17 06:43:09 +02:00
Anton Khirnov 34d2bf30a0 pcmdec: use unique classes for all pcm demuxers. 2011-09-17 06:42:32 +02:00
Anton Khirnov d906f49aa8 rawdec: g722 is always 1 channel/16kHz 2011-09-17 06:42:17 +02:00
Michael Niedermayer 5c5306df96 lavf/utils: rewrite real fps calculation code. 
The new code is free of biasing to the first timestamps
Fixes fraps.fps.test.zip

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 21:29:58 +02:00
Daniel Kristjansson 4460b81f9e mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container 
Support Main Profile at High 1440 Level in MXF container,
using essence coding label from SMPTE RDD 9, table 6.
 2011-09-16 18:16:30 +02:00
Peter Ross 07a70caba7 Binary text decoder 
Decoder and demuxer for various binary text formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-16 05:53:14 +02:00
Michael Niedermayer 62101030c4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: fix byte overreads in SSE-optimized hscale().
  matroskadec: fix typo.
  matroskadec: bail on parsing of incorrect seek index segments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 23:10:26 +02:00
Michael Niedermayer e78d1a594a mpegts: make sure the "standard" code doesnt override the probing with NONE/DATA. 
Fixes video stream detection in vid_0x80.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 23:01:04 +02:00
Laurent Aimar b59efc9434 Fixed size given to init_get_bits(). 
init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-09-15 13:23:04 -07:00
Ingo Brückl 5d305c9398 Correct determination of file size and frames in VBRI headers 
The fields "Number of Bytes" and "Number of Frames" are mixed up. "Bytes"
come first, "Frames" behind.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-15 20:16:55 +02:00
Elvis Presley 5554de13b2 ProRes Decoder 
Signed-off-by: Elvis Presley <elvis@e.p>
 2011-09-15 15:58:56 +02:00
Dustin Brody d7d2f0e63c matroskadec: fix typo. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-15 09:34:38 +02:00
Dustin Brody 4a9628f276 matroskadec: bail on parsing of incorrect seek index segments 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-15 09:34:16 +02:00
Michael Niedermayer 3ee83f4605 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf utils: Remove write-only variable
  lavf utils: Rename shadowing variable
  smacker: fix a few off by 1 errors
  Check for invalid VLC value in smacker decoder.
  Check and propagate errors when VLC trees cannot be built in smacker decoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-14 21:57:47 +02:00
Joakim Plate cdced09ef6 Don't override duration from file header with bitrate duration 
This is most noticable on matroska files which has duration
as part of it's header.
 2011-09-14 20:08:43 +02:00
Joakim Plate 5d70536804 [yop] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 7bcd81299a [wtv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate d9d7174d70 [tta] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate fc12f54ea9 [tmv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 425907809b [r3d] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate e22155ef0e [nsv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate a3f4fc813d [mxfdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 88ad79415c [mpc8] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
Joakim Plate 833358172b [jvd] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:39 +02:00
Joakim Plate 58540d7bd3 [filmstrip] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 928cfc7e4f [ffmdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 1df00ac80f [dv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 75f418064e [cafdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Joakim Plate 598cc84fbf [bink] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
Alex Converse 940173d4d1 lavf utils: Remove write-only variable 2011-09-14 10:35:46 -07:00
Alex Converse 4439caa482 lavf utils: Rename shadowing variable 2011-09-14 10:35:42 -07:00
elupus 9fa47cb773 make mpegts_get_pcr resync if it's not on a valid mpegts packet 2011-09-14 17:11:23 +02:00
elupus 6214266362 cosmetic reindent of mpegts_get_pcr 2011-09-14 17:11:07 +02:00
elupus 0a90b6a43e check return value of url_fseek in mpegts_get_pcr 2011-09-14 17:10:40 +02:00
elupus 880e83827f respect the maximum position mpegts_get_pcr is allowed to seek to 2011-09-14 17:09:56 +02:00
elupus 2130d2f594 remove unused code in mpegts_get_pcr 2011-09-14 17:08:43 +02:00