Wireshark · Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] master-1.12 b97d70d: Fix compilation of packet-btavdtp.c.

[Evan Huus <eapache@xxxxxxxxx>]

On Thu, Jun 26, 2014 at 2:48 PM, Gerald Combs <gerald@xxxxxxxxxxxxx> wrote:

stream_number doesn't exist in 1.12.

Ah, I didn't realize. Never-mind then. This is one of the (few) problems that can show up cherry-picking a change that doesn't result in a merge conflict :P

 

Should g2abc541 and related changes
be cherry-picked?

I don't know, possibly? Michal would probably have a better idea.

 

On 6/26/14 10:54 AM, Evan Huus wrote:
> stream_number still needs to be set to 1, not 0...
>
>
> On Thu, Jun 26, 2014 at 1:47 PM, Wireshark code review
> <code-review-do-not-reply@xxxxxxxxxxxxx

> <mailto:code-review-do-not-reply@xxxxxxxxxxxxx>> wrote:
>
>     URL:
>     https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b97d70d2a68418f74628a5ae3f3a1434233f13a5
>     Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx

>     <mailto:gerald@xxxxxxxxxxxxx>)

>     Changed: branch: master-1.12
>     Repository: wireshark
>
>     Commits:
>
>     b97d70d by Gerald Combs (gerald@xxxxxxxxxxxxx

>     <mailto:gerald@xxxxxxxxxxxxx>):

>
>         Fix compilation of packet-btavdtp.c.
>
>         Change-Id: I6962dafd8c6c2db522fb01178a1b4cdb831ee85b
>         Reviewed-on: https://code.wireshark.org/review/2671
>         Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx

>     <mailto:gerald@xxxxxxxxxxxxx>>

>
>
>     Actions performed:
>
>         from  ced8a05   Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s.
>         adds  b97d70d   Fix compilation of packet-btavdtp.c.
>
>
>     Summary of changes:
>      epan/dissectors/packet-btavdtp.c |    9 +--------
>      1 file changed, 1 insertion(+), 8 deletions(-)
>     ___________________________________________________________________________
>     Sent via:    Wireshark-commits mailing list
>     <wireshark-commits@xxxxxxxxxxxxx

>     <mailto:wireshark-commits@xxxxxxxxxxxxx>>

>     Archives:    http://www.wireshark.org/lists/wireshark-commits
>     Unsubscribe: https://wireshark.org/mailman/options/wireshark-commits
>                  mailto:wireshark-commits-request@xxxxxxxxxxxxx

>     <mailto:wireshark-commits-request@xxxxxxxxxxxxx>?subject=unsubscribe
>
>
>
>
> ___________________________________________________________________________
> Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> Archives:    http://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
>              mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe
>

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe