Merge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 14:24:08 +0000 (15:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 14:24:08 +0000 (15:24 +0100)
commitf25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1
treef15930979e13591f8848fb3808a53b0acd373422
parentad3412d0283bc7db538ee5d28c01223eb327a80d
parent58ae8d595724150c407ca2c2df3aa4bd5580397c
Merge commit '58ae8d595724150c407ca2c2df3aa4bd5580397c'

* commit '58ae8d595724150c407ca2c2df3aa4bd5580397c':
  h264_parser: restore a comment lost in 0268a54

Conflicts:
libavcodec/h264_parser.c

No change, the code that is commented is no longer there in the form to
which the comment applied

Merged-by: Michael Niedermayer <michaelni@gmx.at>