| Age | Commit message (Collapse) | Author |
|---|
|
* qatar/master: (22 commits)
rv40dsp x86: use only one register, for both increment and loop counter
rv40dsp: implement prescaled versions for biweight.
avconv: use default channel layouts when they are unknown
avconv: parse channel layout string
nutdec: K&R formatting cosmetics
vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
mem: Consistently return NULL for av_malloc(0)
vf_overlay: implement poll_frame()
vf_scale: support named constants for sws flags.
lavc doxy: add all installed headers to doxy groups.
lavc doxy: add avfft to the main lavc group.
lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
lavc doxy: add AVPicture functions to a doxy group.
lavc doxy: add resampling functions to a doxy group.
lavc doxy: replace \ with /
lavc doxy: add encoding functions to a doxy group.
lavc doxy: add decoding functions to a doxy group.
lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
lavc doxy: add AVPacket-related stuff to a separate doxy group.
lavc doxy: add core functions/definitions to a doxy group.
...
Conflicts:
ffmpeg.c
libavcodec/avcodec.h
libavcodec/vda.c
libavcodec/x86/rv40dsp.asm
libavfilter/vf_scale.c
libavformat/nutdec.c
libavutil/mem.c
tests/ref/acodec/pcm_s24daud
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* 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>
|
|
Originally committed as revision 23996 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 20542 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 20502 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 20376 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Since vdpau.h was an installed header this would break API.
Originally committed as revision 17225 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
suggested by Michael, the new names better describe the contents of the files.
Originally committed as revision 17168 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16705 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
be used by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 16699 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
be used by video players.
Original patch by NVIDIA corporation.
Originally committed as revision 16628 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16491 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16480 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16448 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16444 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
