Age | Commit message (Collapse) | Author |
|
* qatar/master:
mov: Don't av_malloc(0).
avconv: only allocate 1 AVFrame per input stream
avconv: fix memleaks due to not freeing the AVFrame for audio
h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg).
misc Doxygen markup improvements
doxygen: eliminate Qt-style doxygen syntax
g722: Add a regression test for muxing/demuxing in wav
g722: Change bits per sample to 4
g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample
api-example: update to use avcodec_decode_audio4()
avplay: use avcodec_decode_audio4()
avplay: use a separate buffer for playing silence
avformat: use avcodec_decode_audio4() in avformat_find_stream_info()
avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()
mov: Allow empty stts atom.
doc: document preferred Doxygen syntax and make patcheck detect it
Conflicts:
avconv.c
ffplay.c
libavcodec/mlpdec.c
libavcodec/version.h
libavformat/mov.c
tests/codec-regression.sh
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* qatar/master:
ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6
ARM: NEON optimised vector_clip_int32()
swscale: disable full_chroma_int when converting to non-24/32bpp RGB.
suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy
ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt()
put_bits: remove ALT_BITSTREAM_WRITER
put_bits: always use intreadwrite.h macros
libavformat: Add an example how to use the metadata API
doxygen: Prefer member groups over grouping into modules
doxygen: be more permissive when searching for API examples
avformat: doxify the Metadata API
lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format.
lavf: use the correct pointer in av_open_input_stream().
avidec: infer absolute vs relative index from first packet
Conflicts:
libavformat/Makefile
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Before this, almost all module groups have been used for grouping functions
and fields in structures semantically. This causes them to not appear
properly in the file documentation and needlessly clutters up the "Modules"
index.
Additionally, this commit streamlines some spelling and appearances.
|
|
* qatar/master:
doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Use av_printf_format to check the usage of printf style functions
Add av_printf_format, for marking printf style format strings and their parameters
ARM: enable thumb for Cortex-M* CPUs
nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
build: remove SRC_PATH_BARE variable
build: move basic rules and variables to main Makefile
build: move special targets to end of main Makefile
lavdev: improve feedback in case of invalid frame rate/size
vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
fbdev: prefer "framerate_q" over "fps" in device context
bktr: prefer "framerate" over "fps" for grab_read_header()
ALSA: implement channel layout for playback.
alsa: support unsigned variants of already supported signed formats.
alsa: add support for more formats.
ARM: allow building in Thumb2 mode
Conflicts:
common.mak
doc/APIchanges
libavcodec/vdpau.h
libavdevice/alsa-audio-common.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Signed-off-by: Diego Biurrun <diego@biurrun.de>
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
to the audio conversion routines.
Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 18804 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
more general' changeset. This one relocates the QCELP
especific code to the qcelpdec.* files.
Originally committed as revision 17800 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16003 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15974 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15973 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15961 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15933 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15932 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15901 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Spotted by Jethro Walters
Originally committed as revision 15900 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15892 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15839 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15837 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15831 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15822 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15802 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15797 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15755 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15752 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15740 to svn://svn.ffmpeg.org/ffmpeg/trunk
|