[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=88bd50c592b0d24a12dd178ae2858444400a012f
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

88bd50c by Guy Harris (guy@xxxxxxxxxxxx):

    Don't map the interface ID for records that don't pertain to an interface.
    
    And revert to the previous behavior of map_phdr_interface_id(); that
    change broke the mergecap tests when it was merging pcap files into a
    pcapng file.
    
    Change-Id: I2e079b0e87dce06e98faa9ab7615f9b9b2701b77
    Reviewed-on: https://code.wireshark.org/review/15932
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  5a73176   Win: convert atkversion.h to UTF-8
    adds  88bd50c   Don't map the interface ID for records that don't pertain to an interface.


Summary of changes:
 wiretap/merge.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)