apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-05-08 15:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
45,643 Commits 7 Branches 0 Tags
657998b5ee46719ff873ce34ae953385377b0280
Commit Graph

20973 Commits

Author SHA1 Message Date
Paul B Mahol 9b762e2cba idcinvideo: remove redundant " id CIN Video: " from av_log() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-17 14:09:47 +00:00
Michael Niedermayer d6e87190fd Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc' 
* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
  avcodec_encode_audio(): fix invalid free
  pcm-mpeg: correct bitrate calculation
  ffv1: K&R formatting cosmetics
  fate: Add rangecoder test
  network: #include stdint.h in network.h
  nut: export codec_tag provided by rawvideo
  avserver: move avserver-specific code from ffmdec.c to avserver.c

Conflicts:
	ffserver.c
	libavcodec/ffv1.c
	libavformat/ffmdec.c
	libavformat/nutenc.c
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 14:17:55 +02:00
Paul B Mahol 1ade37ae9c lavc/tta: use meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-17 12:11:34 +00:00
Michael Niedermayer 4e2e3d943e ffv1: fix packed rgb with 1.3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-17 03:19:11 +02:00
Rafaël Carré a25d912dca avcodec_encode_audio(): fix invalid free 
Since 2bc0de385, AVFrame needs to be initialized
before calling avcodec_get_frame_defaults().

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-10-16 18:49:31 +02:00
Christian Schmidt 4a7429203a pcm-mpeg: correct bitrate calculation 
Bitrate calculation is off since the bluray spec always specifies
an even number of coded channels. This was honored in the decoder,
but not for bitrate calculation.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-10-16 16:03:03 +02:00
Luca Barbato 9a978b334b ffv1: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-10-16 15:45:55 +02:00
Michael Niedermayer 83962004f7 Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b' 
* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b':
  tiny_psnr: check for specified sample size less than 1
  fate: improve md5sum utility selection
  rangecoder-test: Drop timer output that clutters stderr

Conflicts:
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 14:04:14 +02:00
Michael Niedermayer 5717562c78 Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d' 
* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
	configure
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 13:57:10 +02:00
Michael Niedermayer 9c669672c7 x86/motion_est: widen before multiply. 
This fixes CID700558, CID700557, CID700556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 03:09:28 +02:00
Michael Niedermayer 1fe45903b8 msvideo1enc: fix interframe encoding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 02:22:27 +02:00
Michael Niedermayer f5581266f7 ra288: assert order to be withinn supported range in do_hybrid_window() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 23:55:54 +02:00
Michael Niedermayer db3a0aae9f msvideo1enc: fix initial keyframe value 
keyframe was never set to anything but 1

Fixes CID733730
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 23:52:08 +02:00
Diego Biurrun f1be514540 rangecoder-test: Drop timer output that clutters stderr 2012-10-15 21:16:36 +02:00
Diego Biurrun c1fcfdec75 rangecoder-test: Return in case of an error 2012-10-15 21:15:17 +02:00
Tomas Härdin 8cbb8f5357 dv: Set FS flag from AVFrame.top_field_first 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 18:53:44 +02:00
Tomas Härdin 7b383bd9d7 dvdec: Set top_field_first from FS flag 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 18:53:44 +02:00
Tomas Härdin 2b4bbd12c2 dvdec: Move the VSC pack parsing to before avctx->execute() 
This allows the next commit to parse the FS flag.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 18:53:44 +02:00
Tim Nicholson 0ee57f8b14 rawdec.c: Extract interlace information from quicktime flag if it exisits. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 18:53:44 +02:00
Paul B Mahol 011f3892ff h264: use designated initializers for AVClass 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 13:43:33 +00:00
Paul B Mahol e75357ea7c xbmenc: cosmetics: reindent 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 13:28:23 +00:00
Paul B Mahol 5864fe62ef flacdec: replace -1 with AV_SAMPLE_FMT_NONE 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 13:26:47 +00:00
Michael Niedermayer 5bac83dae8 shorten: fix U8 to be planar too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 15:09:46 +02:00
Paul B Mahol 916e40b5b4 smacker: return more meaningfull error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 12:48:38 +00:00
Michael Niedermayer ae237a117a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: try to use mmap only if available
  configure: check for mprotect
  wmapro: use planar sample format
  wmalossless: output in planar sample format
  wmadec: use float planar sample format output
  shorten: use planar sample format
  lavc: update documentation for AVFrame.extended_data

Conflicts:
	libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 14:09:35 +02:00
Stefano Sabatini cd559bb49a lavc: add xface image decoder and encoder 
Based on libcompface code by James Ashton <James.Ashton@anu.edu.au>, and
relicensed to LGPL with the author's consent.
 2012-10-15 08:32:18 +02:00
Michael Niedermayer 35782bfbca h264: Change asserts to av_asserts in ff_h264_fill_default_ref_list() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 03:22:00 +02:00
Michael Niedermayer 151469db33 j2kenc: remove unneeded dereference 
Fixes CID703723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-15 03:18:08 +02:00
Justin Ruggles f9d732c264 wmapro: use planar sample format 2012-10-14 16:48:23 -04:00
Justin Ruggles 2725ce7c7c wmalossless: output in planar sample format 2012-10-14 16:48:23 -04:00
Justin Ruggles 7ebfe5b44a wmadec: use float planar sample format output 2012-10-14 16:48:23 -04:00
Justin Ruggles 977eb7d567 shorten: use planar sample format 2012-10-14 16:48:22 -04:00
Michael Niedermayer bc077ca6b5 j2kdec: remove unneeded operation 
Fixes CID717554
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 22:16:31 +02:00
Michael Niedermayer 1e6cbb01e9 j2kdec: make curtilenum integer. 
This fixes a potential crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 22:16:31 +02:00
Michael Niedermayer 0de0ae5a20 tag_tree_decode: check node being non null 
Fixes CID717843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 22:16:31 +02:00
Michael Niedermayer a6cac64f69 compute_lpc_coefs: assert that normalize and fail have a supported combination 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 22:16:31 +02:00
Michael Niedermayer 93ef29b6f4 noise_bsf: fix division by 0 
Fixes CID733737
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 21:45:42 +02:00
Justin Ruggles 8441909f49 lavc: update documentation for AVFrame.extended_data 2012-10-14 15:00:45 -04:00
Michael Chinen c73b1a1d80 flac_parser.c: fix issue with looping output for small files. 
see trac 1345
https://ffmpeg.org/trac/ffmpeg/ticket/1345

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 20:39:10 +02:00
Thilo Borgmann 41bf943f70 bgmc: fix sizeof arguments (should fix CIDs: 700724 and 608084) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 20:37:43 +02:00
Hendrik Leppkes 572781b25f h264: fix parsing of old lossless profile (profile_idc == 144) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 16:04:10 +02:00
Peter Ross 6bf43441f0 eatgq: raise error on unsupported macroblock mode 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 16:01:22 +02:00
Peter Ross 0ea55365b9 ansi: by design nb_args may exceed the size of the args array, so guard accordingly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 15:56:36 +02:00
Michael Niedermayer d6f6a7557c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avutil: Do not make ff_ symbols globally visible.
  avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
  build: tms470: work around glibc math.h problems
  configure: improve tms470 compiler usage with glibc

Conflicts:
	libavcodec/bmpenc.c
	libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 15:11:34 +02:00
Paul B Mahol de3b1116da eatgq: fix small overread 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-14 12:54:10 +00:00
Paul B Mahol dd5aff001e svq1dec: use log level that have more common sense 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-14 09:21:48 +00:00
Paul B Mahol 7b9fc769e4 svq1dec: use more common way to check if result is not zero 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-14 09:18:36 +00:00
Paul B Mahol 8f4020d8a4 svq1dec: check return value of get_bits1() in more common way 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-14 09:14:35 +00:00
Paul B Mahol e2bf1082cc svq1dec: return more meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-14 09:12:19 +00:00
Michael Niedermayer 2217a2249d dpxenc: fix signed c99 overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 05:48:02 +02:00