OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7fff578 f4281f4)
Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:56:30 +0000 (16:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:56:30 +0000 (16:56 +0100)
commitafb3fb335265a443aac83883606fa4274b4330b7
treefbe0bdabf6d302cf89d24002df7904a8f2dca899tree | snapshot
parent7fff5781b6a94fa6f29a1e508f5badbbecf35232commit | diff
parentf4281f457194a6a4489fbd7423e2ab2e13c6d4d9commit | diff
Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'

* commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9':
  asrc_anullsrc: do not set samplerate and channel layout explicitly

Conflicts:
libavfilter/asrc_anullsrc.c

No change to FFmpeg due to semantic difference between the filter sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
external/ffmpeg
About OSDN
Find Software
Develop Software
Help