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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bcd118a74a5c448aad1dd0a2dc9ee0ead75ec345
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

bcd118a by Guy Harris (guy@xxxxxxxxxxxx):

    Fix the nanosecond-resolution pcap magic numbers.
    
    See NSEC_TCPDUMP_MAGIC in
    
         https://github.com/the-tcpdump-group/libpcap/blob/master/sf-pcap.c
    
    The last octet is 0x4d, not 0xd4.
    
    Change-Id: Ie49a7a9c33e59fe119746bec910522a46b46c2f6
    Reviewed-on: https://code.wireshark.org/review/36519
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit a955d38f3a9f8c9952897a5319abc8f8924d15b7)
    Reviewed-on: https://code.wireshark.org/review/36522
    

Actions performed:

    from  919d4e5   Handle nanosecond-resolution pcap files.
     add  bcd118a   Fix the nanosecond-resolution pcap magic numbers.


Summary of changes:
 epan/dissectors/file-pcap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)