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

[Michael Niedermayer]

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

Thanks


*   commit c94dbc9ebd4221f7fccd235715ad07621ffc3ea8
|\  Merge: f0eacbc 54d2017
| | Author: Michael Niedermayer <michaelni at gmx.at>
| | Date:   Tue Feb 5 23:32:38 2013 +0100
| |
| |     Merge remote-tracking branch 'rdp/combined'
| |
| |     * rdp/combined:
| |       dshow: remove hopefully unneeded color_range HDYC addition, see http://ffmpeg.zeranoe.com/forum/viewtopic.php?f=10&t=869&p=3724
| |       dshow: fix log message
| |       dshow: better error reporting
| |       dshow: allow for more codec ID's
| |
| *   commit 54d2017e48eb9f460c899e7fce39c4643e47181e
| |\  Merge: 4ab24a6 b0635e2
| | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | Date:   Tue Jan 15 23:51:46 2013 -0700
| | |
| | |     Merge remote-tracking branch 'origin/master' into combined
| | |
| * | commit 4ab24a6712d77141552a46d1fedd8c0ca9daeb82
| | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | Date:   Tue Jan 15 23:20:43 2013 -0700
| | |
| | |     dshow: remove hopefully unneeded color_range HDYC addition, see http://ffmpeg.zeranoe.com/forum/viewtopic.php?f=10&t=869&p=3724
| | |
| | |     Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
| | |
| * | commit b5eb6d2b1f7ff7be155c9ae11f35dba30d551f3d
| | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | Date:   Tue Jan 15 23:09:54 2013 -0700
| | |
| | |     dshow: fix log message
| | |
| | |     Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
| | |
| * |   commit f003f4202470f8a14583f9e46cf56b702251dc0d
| |\ \  Merge: 114f6b1 f7b7f02
| | | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | | Date:   Tue Jan 15 23:08:26 2013 -0700
| | | |
| | | |     Merge remote-tracking branch 'origin/master' into combined
| | | |
| * | |   commit 114f6b1b4fab58306996b3faf11101787c67df95
| |\ \ \  Merge: c540312 55ada3a
| | | | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | | | Date:   Tue Jan 15 23:08:09 2013 -0700
| | | | |
| | | | |     Merge branch 'better_pix_fmt' into combined
| | | | |
| | * | |   commit 55ada3a9f34fdd05e642c4009aee7ca55293049b
| | |\ \ \  Merge: 47e8848 8c3de1a
| | | | | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | | | | Date:   Tue Jan 15 18:57:38 2013 -0700
| | | | | |
| | | | | |     Merge branch 'better_codec_id_take2' into better_pix_fmt
| | | | | |
| | | * | | commit 8c3de1abeea9d1f2dedf0e823a9f75840edb3295
| | | | | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | | | | Date:   Tue Jan 15 15:08:23 2013 -0700
| | | | | |
| | | | | |     dshow: better error reporting
| | | | | |
| | | | | |     Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
| | | | | |
| | | * | | commit 8168cbc969e39bf094ed7c5e56be985c4a68d351
| | | | | | Author: rogerdpack <rogerpack2005 at gmail.com>
| | | | | | Date:   Tue Jan 15 15:01:43 2013 -0700
| | | | | |
| | | | | |     dshow: allow for more codec ID's
| | | | | |
| | | | | |     Signed-off-by: rogerdpack <rogerpack2005 at gmail.com>
| | | | | |

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct answer.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130206/1c6fbf22/attachment.asc>