generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,100 Commits 24 Branches 241 Tags 173 MiB
abd71130bd
Commit Graph

8 Commits

Author SHA1 Message Date
Stefano Sabatini
00a9ac424e examples/encoding.c: adopt a less restrictive license 
Adopt ISC (Internet Systems Consortium) license in place of LGPL,
consistent with the other examples.

Fabrice explicitely approved the relicensing.
 2011-07-23 10:52:24 +02:00
Michael Niedermayer
3602ad7ee6 Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
  swscale: fix crash with dithering due incorrect offset calculation.
  matroskadec: fix stupid typo (!= -> ==)
  build: remove duplicates from order-only directory prerequisite list
  build: rework rules for things in the tools dir
  configure: fix --cpu=host with gcc 4.6
  ARM: use const macro to define constant data in asm
  bitdepth: simplify FUNC/FUNCC macros
  dsputil: remove ff_emulated_edge_mc macro used in one place
  9/10-bit: simplify clipping macros
  matroskadec: reindent
  matroskadec: defer parsing of cues element until we seek.
  lavc: add support for codec-specific defaults.
  lavc: make avcodec_alloc_context3 officially public.
  lavc: remove a half-working attempt at different defaults for audio/video codecs.
  ac3dec: add a drc_scale private option
  lavf: add avformat_find_stream_info()
  lavc: introduce avcodec_open2() as a replacement for avcodec_open().

Conflicts:
	Makefile
	libavcodec/utils.c
	libavformat/avformat.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-11 04:23:25 +02:00
Stefano Sabatini
c762f9fa2d examples/encoding.c: remove unnecessary includes 
Simplify.
 2011-07-10 18:03:17 +02:00
Stefano Sabatini
2e5a9e580c examples/encoding.c: use av_image_alloc() for allocating an image buffer 
Simplify.
 2011-07-10 18:03:17 +02:00
Stefano Sabatini
a7aabda267 examples/encoding.c: replace "this library" with "libavcodec" in doxy 
So it is more clear the context of the sentence.
 2011-07-09 15:45:18 +02:00
Stefano Sabatini
ffe3856de7 examples/encoding.c: remove reference to unexisting file 2011-07-09 15:45:12 +02:00
Stefano Sabatini
26f373988d examples/muxing.c: set sample format for encoding 
This is required, or avcodec_open() will abort because of invalid
sample format.
 2011-07-09 15:26:09 +02:00
Stefano Sabatini
79f3384ce1 examples: rename "-example" suffix from examples files 
The suffix is redundant since the containing directory itself is
called "examples". Simplify.
 2011-07-04 11:03:54 +02:00