opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-07-11 04:23:25 +02:00
parent 3b2d285afb 142e76f105
commit 3602ad7ee6
37 changed files with 360 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/examples/encoding.c
View File

@ -56,7 +56,7 @@ static void audio_encode_example(const char *filename)
exit(1);
}
c= avcodec_alloc_context();
c = avcodec_alloc_context3(codec);
/* put sample parameters */
c->bit_rate = 64000;
@ -127,7 +127,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)
exit(1);
}
c= avcodec_alloc_context();
c = avcodec_alloc_context3(codec);
/* open it */
if (avcodec_open(c, codec) < 0) {
@ -208,7 +208,7 @@ static void video_encode_example(const char *filename)
exit(1);
}
c= avcodec_alloc_context();
c = avcodec_alloc_context3(codec);
picture= avcodec_alloc_frame();
/* put sample parameters */
@ -335,7 +335,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
exit(1);
}
c= avcodec_alloc_context();
c = avcodec_alloc_context3(codec);
picture= avcodec_alloc_frame();
if(codec->capabilities&CODEC_CAP_TRUNCATED)