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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-11-26 01:12:08 +01:00
parent a11eeb9215 f32dfad9dc
commit 022f8d27dd
28 changed files with 119 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/audioconvert.c
View File

@ -60,7 +60,7 @@ static const char *get_channel_name(int channel_id)
static const struct {
const char *name;
int nb_channels;
int64_t layout;
uint64_t layout;
} channel_layout_map[] = {
{ "mono", 1, AV_CH_LAYOUT_MONO },
{ "stereo", 2, AV_CH_LAYOUT_STEREO },
@ -76,7 +76,7 @@ static const struct {
{ 0 }
};
static int64_t get_channel_layout_single(const char *name, int name_len)
static uint64_t get_channel_layout_single(const char *name, int name_len)
{
int i;
char *end;
@ -102,7 +102,7 @@ static int64_t get_channel_layout_single(const char *name, int name_len)
return 0;
}
int64_t av_get_channel_layout(const char *name)
uint64_t av_get_channel_layout(const char *name)
{
const char *n, *e;
const char *name_end = name + strlen(name);
@ -119,7 +119,7 @@ int64_t av_get_channel_layout(const char *name)
}
void av_get_channel_layout_string(char *buf, int buf_size,
int nb_channels, int64_t channel_layout)
int nb_channels, uint64_t channel_layout)
{
int i;
@ -138,7 +138,7 @@ void av_get_channel_layout_string(char *buf, int buf_size,
int i, ch;
av_strlcat(buf, " (", buf_size);
for (i = 0, ch = 0; i < 64; i++) {
if ((channel_layout & (1L << i))) {
if ((channel_layout & (UINT64_C(1) << i))) {
const char *name = get_channel_name(i);
if (name) {
if (ch > 0)
@ -152,7 +152,7 @@ void av_get_channel_layout_string(char *buf, int buf_size,
}
}
int av_get_channel_layout_nb_channels(int64_t channel_layout)
int av_get_channel_layout_nb_channels(uint64_t channel_layout)
{
int count;
uint64_t x = channel_layout;