Age | Commit message (Collapse) | Author |
|
* qatar/master:
swscale: Readd #define _SVID_SOURCE
Fix av_get_channel_layout_string() for positions >31
configure: Store vda lib flags in extralibs instead of ldflags
Make channel layout masks unsigned
dca: ARMv6 optimised decode_blockcode()
nullenc: drop AVFMT_RAWPICTURE from the flags
frame-mt: return consumed packet size in ff_thread_decode_frame
aacdec: add more fate tests covering SBR and PS
MK(BE)TAG: avoid undefined shifts
Conflicts:
configure
libavcodec/arm/dca.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/version.h
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavutil/audioconvert.c
libavutil/avutil.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.
Fixes a few invalid shifts.
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
* newdev/master:
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
Use audio_service_type to set stream disposition.
Add APIchanges entry for audio_service_type.
Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
configure: in check_ld, place new -l flags before existing ones
support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
doc: update build system documentation
aacenc: indentation
aacenc: fix the side calculation in search_for_ms
vp8.c: rename EDGE_* to VP8_EDGE_*.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
and decoder, and vice-versa for the AC-3 encoder.
|
|
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
|
Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by Joakim Plate (elupus A ecce D se).
Originally committed as revision 17447 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
will follow
Patch by Alex Converse ( alex converse gmail com )
Originally committed as revision 16479 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.' to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Patch by David LIU david liu st com
Originally committed as revision 13962 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 13043 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
based on a patch by Bartlomiej
Originally committed as revision 12895 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12888 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12778 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12759 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
decoder
Originally committed as revision 12758 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12622 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 12570 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Bartlomiej Wolowiec (bartek wolowiec gmail com)
Originally committed as revision 12564 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8942 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk
|