virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
87,566 Commits 37 Branches 400 Tags 464 MiB
d7458ca8d7
Commit Graph

144 Commits

Author SHA1 Message Date
Lou Logan
919e038a95 doc: fix typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-01-07 17:17:33 -09:00
Lou Logan
8a95379990 doc/encoders: add basic libx265 documentation 
Fixes ticket #3944.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-10-15 09:45:54 -08:00
Michael Niedermayer
0a7afedc48 avcodec/libx264: add avcintra-class 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-01 16:39:19 +02:00
Deb Mukherjee
b6a0b8bcf4 Adds support for setting aq_mode in libvpx encoder 
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-27 23:12:47 -03:00
Andreas Cadhalpun
e59ce54412 doc: fix two spelling errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-20 23:58:36 +02:00
Oliver Fromme
699d2107be doc/encoders: Document "dvdsub workaround for some players" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 17:07:14 +02:00
Marton Balint
9236f7b5a2 mpeg12enc: add seq_disp_ext option for deciding when to write a sequence_display_extension 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 19:45:53 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Michael Niedermayer
624327988f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: Completely document the x264 options

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 04:54:26 +02:00
Luca Barbato
e6e8be542b doc: Completely document the x264 options 
And fix an option mismatch.
 2014-04-08 23:24:42 +02:00
Luca Barbato
0d671ade99 doc: Use a 3 columns multitable 
Make the html output much nicer.
 2014-04-08 23:24:42 +02:00
Timothy Gu
c389a80494 libxvid: Add SSIM displaying through a libxvidcore plugin 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-06 23:23:13 +02:00
Timothy Gu
5ce7ca68b8 libxvid: add working lumimasking and variance AQ 
The old implementation is unusable due to changes in the Xvid API.
Further fixes by Michael Niedermayer <michaelni@gmx.at>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-04-06 23:23:13 +02:00
Andreas Cadhalpun
d473f2d18a Fix spelling errors in texi files: more informations --> more information allows to --> allows one to 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-27 03:58:56 +01:00
Andreas Cadhalpun
9898bd9a82 Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 21:12:40 +01:00
Timothy Gu
4a37e2977c libfdk-aacenc: disable hard version requirements 
Enable compilation on machines with an old libfdk-aac.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-06 02:33:33 +01:00
Michael Niedermayer
6dc9d2cf47 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: document correct option to list encoders

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-30 16:00:47 +01:00
John Stebbins
64ba831da9 doc: document correct option to list encoders 2014-01-29 23:27:37 +01:00
Timothy Gu
093439b481 doc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb) 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2014-01-19 13:40:32 +01:00
Timothy Gu
f4c62b9f64 doc/encoders: add wavpackenc doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-12-29 13:10:11 +01:00
Timothy Gu
eb38e684b4 doc/encoders: reformat libwavpack documentation 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2013-12-29 13:10:11 +01:00
Michael Niedermayer
6fe5f770db Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b' 
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
  Add a libwebp encoder

Conflicts:
	Changelog
	doc/encoders.texi
	doc/general.texi
	libavcodec/version.h
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-22 11:53:41 +01:00
Justin Ruggles
be7c323176 Add a libwebp encoder 2013-12-21 17:01:42 -05:00
Stefano Sabatini
e2ad4e65a1 doc/encoders/libfdk_aac: state that VBR support is experimental 2013-11-22 14:55:01 +01:00
Stefano Sabatini
9459569897 doc/encoders/libfdk_aac: fix a few typos 2013-11-22 14:55:01 +01:00
Stefano Sabatini
80c85460fd doc/encoders/libfdk_aac: use @ref to reference libfaac 2013-11-22 14:45:43 +01:00
Paul B Mahol
74906d3727 avcodec/libopusenc: change default frame duration to 20 ms 
20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-18 01:46:32 +00:00
Timothy Gu
bc27309591 doc/encoders: fix libfdk-aac "Examples" subsection 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-10 12:36:54 +01:00
Timothy Gu
d3211cfaed avcodec/libmp3lame: add ABR support 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:44:20 +01:00
Stefano Sabatini
2acc525d78 doc/encoders: add libfaac encoder documentation 2013-11-01 12:51:39 +01:00
Stefano Sabatini
d339e03fc3 doc/encoders: document the libfdk-aac wrapper 
Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide
guide.
 2013-11-01 12:51:39 +01:00
Stefano Sabatini
4fdec65eb3 doc/encoders: extend/clarify libtheora encoder documentation 2013-11-01 12:51:39 +01:00
Stefano Sabatini
5b53dd0803 doc/encoders: replace @xref with @ref command 
@xref is ignored by texi2pod.
 2013-10-27 15:32:25 +01:00
Timothy Gu
43041a7b4a doc/encoders: add libshine doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-27 13:02:32 +01:00
Timothy Gu
0be74cf0f5 doc/encoders: add libvorbis doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 11:32:56 +02:00
Timothy Gu
7ab8bceabc doc/encoder/aac: Remove -cutoff trick 
Fix Ticket #2686 comment 155.

Trick obsoleted since 72dabdfc58.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-10 13:43:56 +02:00
Timothy Gu
81bbe49a0e doc/encoders: improve libvo-aacenc doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-15 11:35:32 +02:00
Timothy Gu
0e11790cf7 doc/encoders: add doc for AAC encoder 
Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-09-15 11:35:17 +02:00
Timothy Gu
e45e72f5f8 doc/encoders: reformat and add some clarification in libtwolame doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-08-30 11:37:07 +02:00
Timothy Gu
40b8350b57 doc/encoders: reformat libmp3lame doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-08-30 11:36:35 +02:00
Michael Niedermayer
560e9365b6 Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de' 
* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de':
  libx264: add shortcut for the bluray compatibility option

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:26:04 +02:00
Luca Barbato
bc54c2ae3c libx264: add shortcut for the bluray compatibility option 
As for intra-refresh it is just a commodity.
 2013-08-05 16:13:35 +02:00
Timothy Gu
3b3c1ed076 libxvid: Add SSIM displaying through a libxvidcore plugin 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 12:41:27 +02:00
Timothy Gu
ccb212b6c3 libxvid: add working lumimasking and variance AQ 
The old implementation is unusable due to change in the Xvid API.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-31 11:57:52 +02:00
Timothy Gu
6b255e5e70 doc/encoders: add libxvid doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-30 16:24:29 +02:00
Stefano Sabatini
b4bd21b7fe doc/codecs: fix dangling reference to codec-options chapter 2013-07-27 16:50:19 +02:00
Timothy Gu
11cb697501 doc/encoders: partially rewrite and reformat libx264 docs 
Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/

Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-24 16:29:12 +02:00
Timothy Gu
561e05136f doc/encoders: add libopus encoder doc 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-07-06 12:27:45 +02:00
Stefano Sabatini
7ebab4159a doc/encoders: apply various fixes to libmp3lame documentation 2013-07-01 16:00:37 +02:00
Timothy Gu
934df3b037 doc/encoders: alphabetically list the encoders 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-06-28 13:07:15 +02:00
Stefano Sabatini
7cc4115dd6 doc/decoders,decoders: add various missing final dots 
Enhance consistency.
 2013-06-21 18:25:49 +02:00
Timothy Gu
9ead06057a doc/encoders: Add libopencore-amrnb doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-19 01:42:55 +02:00
Timothy Gu
0ec65aa104 doc/encoders: Add libvo-amrwbenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-12 23:37:35 +02:00
Michael Niedermayer
73d5cf8f43 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: add a libwavpack encoder wrapper

Conflicts:
	Changelog
	doc/encoders.texi
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-11 09:36:34 +02:00
Anton Khirnov
84d3ff50cd lavc: add a libwavpack encoder wrapper 2013-06-10 21:33:48 +02:00
Timothy Gu
ba7cb4807f doc/encoders: Add libvo-aacenc doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-08 13:52:34 +02:00
Timothy Gu
ea038b996d doc/encoders: add documentation for libtwolame 2013-06-05 08:33:13 +00:00
Michael Niedermayer
f0b9bd807b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresenc: alpha coding support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 11:32:58 +02:00
Stefano Sabatini
f7a267affe doc/encoders: remove duplicated "the" 2013-05-30 10:44:54 +02:00
Kostya Shishkov
0b0953baec proresenc: alpha coding support 2013-05-30 09:23:26 +02:00
Timothy Gu
4703a345fb doc/encoders: Add documentation for libmp3lame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 23:56:49 +02:00
Andrey Utkin
bc63a76083 pngenc: Add 'dpi', 'dpm' options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-13 00:12:45 +02:00
Michael Niedermayer
70b72ca6f3 doc/encoders: Clarify that there are 2 prores encoders 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 23:13:34 +02:00
Michael Niedermayer
97104aa011 Merge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6' 
* commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6':
  doc: document the prores encoder options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 22:36:12 +02:00
Anton Khirnov
f223ad1e00 doc: document the prores encoder options 
Adapted from the author's blag.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-11 12:42:09 +02:00
Vicente Jimenez Aguilar
202b5f6deb doc: Fix some obsolete references to av* tools as ff* tools 
Signed-off-by: Diego Biurrun <diego@biurrun.de>

CC: libav-stable@libav.org
 2013-02-18 13:04:29 +01:00
Michael Niedermayer
d235d240d8 Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d' 
* commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d':
  doc: document libx264 options and mappings
  libx264: introduce -x264-params private option

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-26 14:18:48 +01:00
Luca Barbato
ded3673d77 doc: document libx264 options and mappings 2013-01-25 17:20:03 +01:00
Stefano Sabatini
ae2b51acd2 doc/encoders: clarify the direction of the quality setting parameters for libtheora 2012-12-27 15:47:15 +01:00
Carl Eugen Hoyos
18eb31963b Improve x264opts description. 2012-12-09 18:24:56 +01:00
Ivan Pozdeev
329b8f85b0 doc/encoders: add a note for x264 options that use colon 
Signed-off-by: Ivan Pozdeev <ivan_pozdeev@mail.ru>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-11-25 23:17:26 +01:00
Stefano Sabatini
9d2a7c0481 doc/encoders: document libtheora encoder 2012-11-13 12:15:23 +01:00
James Zern
b9e5c5f178 doc/encoders: update libvpxenc mappings 
max-intra-rate / force_key_frames, forgotten in 695e85f, cb7f062.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-13 11:33:00 +02:00
Clément Bœsch
dc7ad85c40 doc: use @command{} for commands. 2012-01-04 13:21:08 +01:00
Clément Bœsch
e1d613515b doc: fix and clarify libx264 encoding. 
tune, fastfirstpass and profile are not available through x264opts.
Since some FFmpeg options don't match the names used in libx264, add
libx264 option names as a reference when needed. And last thing, x264
don't have a manpage ATM, so prefer the x264 --fullhelp over the
unexistant manpage reference.
 2011-10-30 02:08:57 +02:00
Michael Niedermayer
f884ef00de Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffplay.c
	ffprobe.c
	libavcodec/ac3dec.c
	libavcodec/h264.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavfilter/vf_drawtext.c
	libavformat/flvdec.c
	libavformat/mpegtsenc.c
	libavformat/options.c
	libavutil/avutil.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-13 06:00:03 +02:00
Justin Ruggles
3e68b28221 fix ac3 encoder documentation 
some of the mode values were reversed
 2011-10-12 14:52:26 -04:00
Clément Bœsch
9eb1c94713 doc: fix x264_opts/x264opts typo. 2011-09-16 11:50:06 +02:00
James Zern
d013c6da80 doc: cosmetics: libx264 typos 2011-06-02 14:43:29 +02:00
James Zern
0abbd3adb6 doc: add libvpx encoder section 
Documents the mapping from FFmpeg options to libvpx.
 2011-05-31 22:58:31 +02:00
James Zern
011b098cd0 doc: correct AC-3 option subsection placement 
Floating-Point-Only section was added after the video encoders chapter
in 034fc7b merge.
 2011-05-29 00:32:26 +02:00
Michael Niedermayer
39e4206dc6 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (32 commits)
  doc: create separate section for audio encoders
  swscale: Remove orphaned, commented-out function declaration.
  swscale: Eliminate rgb24toyv12_c() duplication.
  Remove h263_msmpeg4 from MpegEncContext.
  APIchanges: Fill in git hash for fps_probe_size (30315a8)
  avformat: Add fpsprobesize as an AVOption.
  avoptions: Return explicitly NAN or {0,0} if the option isn't found
  rtmp: Reindent
  rtmp: Don't try to do av_malloc(0)
  tty: replace AVFormatParameters.sample_rate abuse with a private option.
  Fix end time of last chapter in compute_chapters_end
  ffmpeg: get rid of useless AVInputStream.nb_streams.
  ffmpeg: simplify managing input files and streams
  ffmpeg: purge redundant AVInputStream.index.
  lavf: deprecate AVFormatParameters.channel.
  libdc1394: add a private option for channel.
  dv1394: add a private option for channel.
  v4l2: reindent.
  v4l2: add a private option for channel.
  lavf: deprecate AVFormatParameters.standard.
  ...

Conflicts:
	doc/APIchanges
	doc/encoders.texi
	ffmpeg.c
	libavdevice/alsa-audio.h
	libavformat/version.h
	libavutil/opt.c
	libswscale/rgb2rgb.h
	libswscale/rgb2rgb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-26 03:28:22 +02:00
Stefano Sabatini
a2ee2843c0 doc: create separate section for audio encoders 
Having a separate section for audio encoders simplifies navigation
and is slightly more consistent with the rest of the manual.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-26 01:23:43 +02:00
Michael Niedermayer
034fc7bf12 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  configure: enable memalign_hack automatically when needed
  swscale: unbreak the build on non-x86 systems.
  swscale: remove if(bitexact) branch from functions.
  swscale: remove if(canMMX2BeUsed) conditional.
  swscale: remove swScale_{c,MMX,MMX2} duplication.
  swscale: use emms_c().
  Move emms_c() from libavcodec to libavutil.
  tiff: set palette in the context when specified in TIFF_PAL tag
  rtsp: use strtoul to parse rtptime and seq values.
  pgssubdec: fix incorrect colors.
  dvdsubdec: fix incorrect colors.
  ape: Allow demuxing of files with metadata tags.
  swscale: remove dead macro WRITEBGR24OLD.
  swscale: remove AMD3DNOW "optimizations".
  swscale: remove duplicate code in ppc/ subdirectory.
  swscale: remove duplicated x86/ functions.
  swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*.
  vsrc_buffer.h: add file doxy
  vsrc_buffer: tweak error message in init()
  msmpeg4: reindent.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-25 06:32:45 +02:00
Justin Ruggles
7f3a7b5c40 ac3enc: add channel coupling support 
Channel coupling is an optional AC-3 feature that increases quality by
combining high frequency information from multiple channels into a
single channel. The per-channel high frequency information is sent with
less accuracy in both the frequency and time domains. This allows more
bits to be used for lower frequencies while preserving enough
information to reconstruct the high frequencies.
 2011-05-24 07:52:31 +02:00
Stefano Sabatini
52da548c7d encoders.texi: add documentation for the libx264 encoder 
Also remove -x264opts item from the ffmpeg manual, since it belongs to
the encoders section.
 2011-05-20 10:05:04 +02:00
Stefano Sabatini
d4111e525d encoders.texi: decrease level for audio encoders section 
Make Audio Encoders a separate chapter, and decrese the contained
sections level by one.

Improve rendering, and improve consistency with the other parts of the
manual.
 2011-05-20 09:59:00 +02:00
Michael Niedermayer
c3f5b81125 Merge remote branch 'qatar/master' 
* qatar/master:
  ALPHA: Replace sized int_fast integer types with plain int/unsigned.
Duplicate  DPX image encoder
Duplicate  DPX decoder: read sample aspect ratio
Duplciate  DPX decoder: add buffer size checks.
  ac3enc: clip large coefficient values and negative exponents rather than using av_assert2().
  ac3enc: do not store a bandwidth code for each channel.
  ac3enc: remove bandwidth reduction as fallback for bit allocation failure.
  ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy()
  ac3enc: return error if frame+exponent bits are too large instead of using av_assert2().
  ac3enc: differentiate between current block and reference block in bit_alloc()
  ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes.
  ac3enc: simplify stereo rematrixing decision options
Include both URLs:  Update URL to fate samples

Conflicts:
	Changelog
	doc/fate.txt
	libavcodec/ac3enc.c
	libavcodec/dpxenc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-02 03:45:58 +02:00
Justin Ruggles
e0b33d479c ac3enc: simplify stereo rematrixing decision options 2011-05-01 13:32:03 -04:00
Michael Niedermayer
25d8099beb Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED:  Remove arrozcru URL from documentation
  sndio support for playback and record

Conflicts:
	doc/faq.texi
	doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-28 01:50:36 +02:00
Justin Ruggles
991f3de1bb ac3enc: Add codec-specific options for writing AC-3 metadata. 2011-03-27 11:30:09 -04:00
Michael Niedermayer
a6be21d3ba Revert "replace FFmpeg with Libav in doc/" 
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
 2011-03-17 17:26:45 +01:00
Janne Grunau
f8a45fa1b1 replace FFmpeg with Libav in doc/ 
unless it stands for ffmpeg the program or is historic
 2011-03-16 22:01:01 +01:00
James Zern
0fa904c9d8 documentation: add encoders chapter 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-02-17 00:04:31 +01:00