[FFmpeg-devel] [PATCH] dshow: allow for more codecs take 2

[Roger Pack]

On 2/5/13, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Tue, Feb 05, 2013 at 02:24:42PM -0700, Roger Pack wrote:
>> On 2/5/13, Michael Niedermayer <michaelni at gmx.at> wrote:
>> > On Tue, Feb 05, 2013 at 10:05:52AM -0700, Roger Pack wrote:
>> >> On 2/4/13, Michael Niedermayer <michaelni at gmx.at> wrote:
>> >> > On Mon, Feb 04, 2013 at 01:50:11PM -0700, Roger Pack wrote:
>> >> >> On 1/25/13, Roger Pack <rogerdpack2 at gmail.com> wrote:
>> >> >> > Ok after the previous discussion
>> >> >> > http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2012-October/131942.html
>> >> >> > it appears the first patch attached (0001 -- re-attached here and
>> >> >> > modified to apply cleaning to git master) is ok.
>> >> >> >
>> >> >> > Also attached is a second patch for better error logging
>> >> >> > messages.
>> >> >> > Thank you for your consideration in their regard.
>> >> >>
>> >> >> bump for these 2.  Or maybe you could give Ramiro commit rights I'm
>> >> >> sure he wouldn't abuse :)
>> >> >
>> >> > ramiro has commit rights, he also has a github repo
>> >> >
>> >> > you are dshow maintainer, thus if you want me to merge some git
>> >> > repo/branch just say which ...
>> >>
>> >> Ok please merge the https://github.com/rdp/ffmpeg "combined" branch
>> >> (Ramiro or Michael maybe whoever gets to it first).
>> >> Thank you.
>> >
>> > merged
>> >
>> > thanks
>>
>> Thanks!
>>
>> I am something of a novice to  this, and appears I made a small
>> mistake and the "combined" branch was lacking a commit or 2, could you
>> pull and merge it again for me?
>> Sorry for the inconvenience.  Hopefully I'll get some experience with
>> this better..
>
> the combined branch is now in bad shape
> If i do merge it, it would result in below (more merge commits than
> non merge commits):
>
> I suggest you start a new branch and make sure you dont add merge
> commits into that branch, you dont need any ATM
> simply cherry pick all commits you need, then look at the changes
> and make sure they are ok and test them to make sure they work
> then tell me to merge

Oops didn't realize git tracks merges as well.
Please then check the branch combined2 for appropriateness and merge
if appropriate.
Thanks!
-roger-