apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-01 04:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,217 Commits 6 Branches 0 Tags
cc2b4e889d24fa33986ccb0ff7b6455ec16a767f
Commit Graph

38 Commits

Author SHA1 Message Date
Michael Niedermayer
46eb300d01 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: remove MULL inline asm
  mathops: use MUL64 macro where it forms part of other ops
  tty: factorise returning error codes.
  rawdec: add framerate private option.
  x11grab: add framerate private option.
  fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
  bktr: don't error when AVFormatParameters.time_base isn't set.
  cmdutils: add missing const qualifier
  Skip headers not designed to work standalone during 'make checkheaders'.
  Add missing #includes to make headers self-contained.
  musepack: remove unnecessary #include from mpcdata.h
  musepack: remove extraneous mpcdata.h inclusions
  Fix error check in av_file_map()

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-05 03:00:31 +02:00
Mans Rullgard
95912731c2 mathops: use MUL64 macro where it forms part of other ops 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-04 20:10:20 +01:00
Diego Biurrun
8d459acc10 Add missing #includes to make headers self-contained. 
This fixes 'make checkheaders'.
 2011-06-04 18:15:50 +02:00
Michael Niedermayer
f8ae3a2108 Merge remote branch 'qatar/master' 
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-17 04:51:33 +02:00
Mans Rullgard
005db47011 mathops: remove ancient confusing comment 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-16 21:34:39 +01:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Måns Rullgård
cf60d669a6 Add more int packing macros, name them consistently 
Originally committed as revision 23916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 22:33:38 +00:00
Ronald S. Bultje
157cb0694a Rename PACK4x8() to PACK4UINT8(). 
Originally committed as revision 23721 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 20:57:00 +00:00
Ronald S. Bultje
b39a2d19d4 Add a macro to pack 4 bytes into native byte-order so they can be written 
at once using a single 32-bit store.

Originally committed as revision 23715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-22 19:15:27 +00:00
Michael Niedermayer
e969e261a5 Use standard C for implementing sign_extend() and zero_extend(). 
This fixes compilation of probetest

Originally committed as revision 23116 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 16:32:21 +00:00
Måns Rullgård
48960b8f24 Add zero_extend() function 
Originally committed as revision 21947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 21:48:37 +00:00
Måns Rullgård
5e46be96f8 Move NEG_[US]SR32 macros to mathops.h 
Originally committed as revision 21873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 23:58:59 +00:00
Måns Rullgård
f2c694af28 Add UMULH() 
This function/macro returns the high half of the unsigned 64-bit
product of two unsigned 32-bit operands.

Originally committed as revision 21463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-26 18:05:55 +00:00
Måns Rullgård
5e7dfb7de1 Move COPY3_IF_LT to lavc/mathops.h 
This obscure macro is only used in motion_est.c so having it in lavc
makes more sense.  See discussion here:
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-November/056561.html

Originally committed as revision 21346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-20 06:01:54 +00:00
Måns Rullgård
b7904f78c1 AVR32: optimised mathops.h 
44% faster MP3 decoding

Originally committed as revision 19667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-17 02:23:53 +00:00
Måns Rullgård
9d48e28f00 MIPS: add MIPS64 and Loongson asm for MAC64/MLS64 
Originally committed as revision 18979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-28 23:19:32 +00:00
Måns Rullgård
e20a4f53a0 mathops: sort arch-specific #include lines 
Originally committed as revision 18886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-20 18:49:55 +00:00
Måns Rullgård
26f6a57467 mathops: whitespace cosmetics 
Originally committed as revision 18885 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-20 18:49:52 +00:00
Måns Rullgård
101dfa7d0a Add sign_extend() function to mathops.h 
Originally committed as revision 17738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 00:03:55 +00:00
Loren Merritt
6166516d1f re-enable mid_pred asm on x86_64. (broke in r16681) 
Originally committed as revision 17058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 17:44:04 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
199436b952 moves mid_pred() into mathops.h (with arch specific code split by directory) 
Originally committed as revision 16681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-18 22:57:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Diego Biurrun
79cb09b2f7 consistency cosmetics: Rename POWERPC identifiers to PPC. 
Originally committed as revision 16359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-27 11:33:26 +00:00
Diego Biurrun
a6493a8fbd Rename libavcodec/i386/ --> libavcodec/x86/. 
It contains optimizations that are not specific to i386 and
libavutil uses this naming scheme already.

Originally committed as revision 16270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 09:12:42 +00:00
Måns Rullgård
a2fc0f6a6d ARM: replace "armv4l" with "arm" 
Originally committed as revision 16179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-17 00:54:54 +00:00
Måns Rullgård
4deaa94639 Add shift argument to MULL() macro 
This replaces use of FRAC_BITS in the MULL() definition with a third
argument specifying the shift amount.  All uses of this macro are
updated to pass FRAC_BITS as third argument.

Originally committed as revision 15921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-24 09:28:55 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Måns Rullgård
ffa978f157 mathops: add MAC64, MLS64, and MLS16 
MAC64: 64 += 32 x 32 (bits)
MLS64: 64 -= 32 x 32
MLS16: 32 -= 16 x 16

Originally committed as revision 14198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 12:22:57 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Måns Rullgård
e6b790f9e7 fix typo ARCH_PPC -> ARCH_POWERPC 
Originally committed as revision 12465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 02:33:02 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +00:00
Marc Hoffman
14da6549a7 Hooking bfin/mathops.h 
Originally committed as revision 10263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-30 15:16:52 +00:00
Måns Rullgård
99545457bf include all prerequisites in header files 
Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 22:59:13 +00:00
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h 
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-08 00:35:08 +00:00
Diego Biurrun
419b878494 Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change 
the semantics of ARCH_X86 to mean both 32 and 64 bits.

Originally committed as revision 6852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 17:01:33 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Luca Barbato
99aed7c8fc New single instruction math operation header 
Originally committed as revision 6291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-19 22:22:29 +00:00