diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 15:24:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 15:24:08 +0100 |
| commit | f25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1 (patch) | |
| tree | f15930979e13591f8848fb3808a53b0acd373422 /libavcodec/arm/h264pred_init_arm.c | |
| parent | ad3412d0283bc7db538ee5d28c01223eb327a80d (diff) | |
| parent | 58ae8d595724150c407ca2c2df3aa4bd5580397c (diff) | |
| download | ffmpeg-f25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1.tar.gz | |
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>
Diffstat (limited to 'libavcodec/arm/h264pred_init_arm.c')
0 files changed, 0 insertions, 0 deletions